X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=win32.c;h=fc08d61088a22c6a5690e0d0d561745d63391729;hp=ecb049a495e9f504f149cd1e0a6d87ffae8ab5df;hb=19666b12c8faf42138225ff4925629c75708240b;hpb=53a7b1252f28700bcac181b241bcc6f64601013d diff --git a/win32.c b/win32.c index ecb049a4..fc08d610 100644 --- a/win32.c +++ b/win32.c @@ -1,4 +1,4 @@ -const char win32_rcs[] = "$Id: win32.c,v 1.1.1.1 2001/05/15 13:59:08 oes Exp $"; +const char win32_rcs[] = "$Id: win32.c,v 1.3 2001/11/16 00:46:31 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/win32.c,v $ @@ -31,6 +31,12 @@ const char win32_rcs[] = "$Id: win32.c,v 1.1.1.1 2001/05/15 13:59:08 oes Exp $"; * * Revisions : * $Log: win32.c,v $ + * Revision 1.3 2001/11/16 00:46:31 jongfoster + * Fixing compiler warnings + * + * Revision 1.2 2001/07/29 19:32:00 jongfoster + * Renaming _main() [mingw32 only] to real_main(), for ANSI compliance. + * * Revision 1.1.1.1 2001/05/15 13:59:08 oes * Initial import of version 2.9.3 source tree * @@ -108,7 +114,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine int argc = 0; int i; int res; - char **argv = NULL; + const char **argv = NULL; char *pszArgs = NULL; char *pszLastTok; char szModule[MAX_PATH+1]; @@ -135,7 +141,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine } /* Allocate array of strings */ - argv = (char **)malloc(sizeof(char *) * argc); + argv = (const char **)malloc(sizeof(const char *) * argc); /* step through command line replacing spaces with zeros, initialise array */ argv[0] = szModule; @@ -173,7 +179,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine #endif /* Cleanup */ - free(argv); + free((void *)argv); free(pszArgs); return res;