From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 1 May 2008 18:13:44 +0000 (+0000)
Subject: For legacy VC6, there's no __CRTDECL or _tstoi yet, but the
X-Git-Tag: 2.3.0~677
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce642c76a758c169afab94fd48518388d7fe4f0f;p=thirdparty%2Fapache%2Fhttpd.git

For legacy VC6, there's no __CRTDECL or _tstoi yet, but the
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
---

diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c
index 71a418cd1e4..6d97fb7b7fc 100644
--- a/support/win32/ApacheMonitor.c
+++ b/support/win32/ApacheMonitor.c
@@ -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))