X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=win32.c;h=fc08d61088a22c6a5690e0d0d561745d63391729;hp=2252dc1fe5322260e67169573c6006229391753e;hb=e7d0f5c0644064de7c224adfddf688a9fe5fc386;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7

diff --git a/win32.c b/win32.c
index 2252dc1f..fc08d610 100644
--- a/win32.c
+++ b/win32.c
@@ -1,7 +1,7 @@
-const char win32_rcs[] = "$Id: win32.c,v 1.1 2001/05/13 21:57:07 administrator Exp $";
+const char win32_rcs[] = "$Id: win32.c,v 1.3 2001/11/16 00:46:31 jongfoster Exp $";
 /*********************************************************************
  *
- * File        :  $Source: /home/administrator/cvs/ijb/win32.c,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/win32.c,v $
  *
  * Purpose     :  Win32 User Interface initialization and message loop
  *
@@ -31,6 +31,15 @@ const char win32_rcs[] = "$Id: win32.c,v 1.1 2001/05/13 21:57:07 administrator E
  *
  * 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
+ *
  *
  *********************************************************************/
 
@@ -105,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];
@@ -132,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;
@@ -164,13 +173,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 #endif
 
 #ifdef __MINGW32__
-   res = _main( argc, argv );
+   res = real_main( argc, argv );
 #else
    res = main( argc, argv );
 #endif
 
    /* Cleanup */
-   free(argv);
+   free((void *)argv);
    free(pszArgs);
 
    return res;