Commit 788f35b1 authored by Sergey Lyubka's avatar Sergey Lyubka

Merge pull request #411 from mmicko/master

Make mongoose compile on mingw environment
parents e0822ffb 3721efe1
...@@ -11,6 +11,7 @@ NS = ../../net_skeleton ...@@ -11,6 +11,7 @@ NS = ../../net_skeleton
SW = ../../ssl_wrapper SW = ../../ssl_wrapper
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
ifndef MINGW
MSVC = ../../vc6 MSVC = ../../vc6
RM = del /q /f RM = del /q /f
OUT = OUT =
...@@ -18,6 +19,10 @@ ifeq ($(OS),Windows_NT) ...@@ -18,6 +19,10 @@ ifeq ($(OS),Windows_NT)
CFLAGS = /MD /TC /nologo /W3 /I$(MSVC)/include /I.. CFLAGS = /MD /TC /nologo /W3 /I$(MSVC)/include /I..
CFLAGS += /link /incremental:no /libpath:$(MSVC)/lib /machine:IX86 CFLAGS += /link /incremental:no /libpath:$(MSVC)/lib /machine:IX86
CFLAGS += $(CFLAGS_EXTRA) CFLAGS += $(CFLAGS_EXTRA)
else
CC = g++
CFLAGS = -W -Wall -Wno-unused-parameter -I.. -O0 -g -pipe $(CFLAGS_EXTRA) -lwsock32
endif
else else
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
CC = g++ CC = g++
......
...@@ -1807,8 +1807,8 @@ static void abs_path(const char *utf8_path, char *abs_path, size_t len) { ...@@ -1807,8 +1807,8 @@ static void abs_path(const char *utf8_path, char *abs_path, size_t len) {
static process_id_t start_process(char *interp, const char *cmd, static process_id_t start_process(char *interp, const char *cmd,
const char *env, const char *envp[], const char *env, const char *envp[],
const char *dir, sock_t sock) { const char *dir, sock_t sock) {
STARTUPINFOW si = {0}; STARTUPINFOW si;
PROCESS_INFORMATION pi = {0}; PROCESS_INFORMATION pi;
HANDLE a[2], b[2], me = GetCurrentProcess(); HANDLE a[2], b[2], me = GetCurrentProcess();
wchar_t wcmd[MAX_PATH_SIZE], full_dir[MAX_PATH_SIZE]; wchar_t wcmd[MAX_PATH_SIZE], full_dir[MAX_PATH_SIZE];
char buf[MAX_PATH_SIZE], buf4[MAX_PATH_SIZE], buf5[MAX_PATH_SIZE], char buf[MAX_PATH_SIZE], buf4[MAX_PATH_SIZE], buf5[MAX_PATH_SIZE],
...@@ -1816,6 +1816,9 @@ static process_id_t start_process(char *interp, const char *cmd, ...@@ -1816,6 +1816,9 @@ static process_id_t start_process(char *interp, const char *cmd,
DWORD flags = DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS; DWORD flags = DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS;
FILE *fp; FILE *fp;
memset(&si, 0, sizeof(si));
memset(&pi, 0, sizeof(pi));
si.cb = sizeof(si); si.cb = sizeof(si);
si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
si.wShowWindow = SW_HIDE; si.wShowWindow = SW_HIDE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment