diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2016-07-05 23:20:42 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2016-07-05 23:20:42 +0200 |
| commit | d5ffc4eb85d71c901c85119cf873e343349e97e2 (patch) | |
| tree | 564636012ef7538ed4d7096b83c994dbda76c9db /support/win32 | |
| parent | 48eddd3d39fa2668ee29198ebfb33c41d4738c21 (diff) | |
| download | apache2-upstream.tar.gz | |
Imported Upstream version 2.4.23upstream
Diffstat (limited to 'support/win32')
| -rw-r--r-- | support/win32/ApacheMonitor.c | 2 | ||||
| -rw-r--r-- | support/win32/wintty.mak | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c index c6021f3b..26b54a00 100644 --- a/support/win32/ApacheMonitor.c +++ b/support/win32/ApacheMonitor.c @@ -1586,8 +1586,10 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, #ifdef UNICODE __wargv = CommandLineToArgvW(GetCommandLineW(), &__argc); #else +#if defined(_MSC_VER) && _MSC_VER < 1800 _setargv(); #endif +#endif if ((__argc == 2) && (_tcscmp(__targv[1], _T("--kill")) == 0)) { diff --git a/support/win32/wintty.mak b/support/win32/wintty.mak index 6448c1bd..d2c3d6c7 100644 --- a/support/win32/wintty.mak +++ b/support/win32/wintty.mak @@ -295,14 +295,14 @@ SOURCE=..\..\build\win32\httpd.rc "$(INTDIR)\wintty.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\wintty.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "NDEBUG" /d "APP_FILE" /d BIN_NAME="wintty.exe" /d LONG_NAME="Apache wintty console pipe" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\wintty.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "NDEBUG" /d "APP_FILE" /d BIN_NAME="wintty.exe" /d LONG_NAME="Apache wintty console pipe" $(SOURCE) !ELSEIF "$(CFG)" == "wintty - Win32 Debug" "$(INTDIR)\wintty.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\wintty.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "_DEBUG" /d "APP_FILE" /d BIN_NAME="wintty.exe" /d LONG_NAME="Apache wintty console pipe" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\wintty.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "_DEBUG" /d "APP_FILE" /d BIN_NAME="wintty.exe" /d LONG_NAME="Apache wintty console pipe" $(SOURCE) !ENDIF |