]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
For legacy VC6, there's no __CRTDECL or _tstoi yet, but the
authorWilliam A. Rowe Jr <wrowe@apache.org>
Thu, 1 May 2008 18:13:44 +0000 (18:13 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Thu, 1 May 2008 18:13:44 +0000 (18:13 +0000)
former is only interesting for ".NET" builds, and the later
is identical to _ttoi (still supported in VC2005, at least).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@652599 13f79535-47bb-0310-9956-ffa450edef68

support/win32/ApacheMonitor.c

index 71a418cd1e4abfc9600a38ca6f0ee8bd0c188b23..6d97fb7b7fcc10ed34e7e9925eb1d71026450ad4 100644 (file)
@@ -1814,7 +1814,7 @@ HWND CreateMainWindow(HINSTANCE hInstance)
 
 #ifndef UNICODE
 /* Borrowed from CRT internal.h for _MBCS argc/argv parsing in this GUI app */
-int  __CRTDECL _setargv(void);
+int  __cdecl _setargv(void);
 #endif
 
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
@@ -1872,7 +1872,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
     }
     else if ((__argc == 4) && (g_dwOSVersion >= OS_VERSION_WIN2K))
     {
-        dwControl = _tstoi(__targv[1]);
+        dwControl = _ttoi(__targv[1]);
         if ((dwControl != SERVICE_CONTROL_CONTINUE) &&
             (dwControl != SERVICE_APACHE_RESTART) &&
             (dwControl != SERVICE_CONTROL_STOP))