mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-08-05 13:14:11 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #411 from mmicko/master

Browse Source 
Make mongoose compile on mingw environment
This commit is contained in:
Sergey Lyubka 2014-08-11 15:01:33 +01:00
commit 788f35b19c
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
examples/Makefile
View File

@ -11,13 +11,18 @@ NS = ../../net_skeleton
SW = ../../ssl_wrapper SW = ../../ssl_wrapper
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
MSVC = ../../vc6 ifndef MINGW
RM = del /q /f MSVC = ../../vc6
OUT = RM = del /q /f
CC = $(MSVC)/bin/cl OUT =
CFLAGS = /MD /TC /nologo /W3 /I$(MSVC)/include /I.. CC = $(MSVC)/bin/cl
CFLAGS += /link /incremental:no /libpath:$(MSVC)/lib /machine:IX86 CFLAGS = /MD /TC /nologo /W3 /I$(MSVC)/include /I..
CFLAGS += $(CFLAGS_EXTRA) CFLAGS += /link /incremental:no /libpath:$(MSVC)/lib /machine:IX86
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++

7
mongoose.c
View File

@ -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,
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;