From: jongfoster <jongfoster@users.sourceforge.net>
Date: Sun, 29 Jul 2001 19:32:00 +0000 (+0000)
Subject: Renaming _main() [mingw32 only] to real_main(), for ANSI compliance.
X-Git-Tag: v_2_9_9~181
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=53a7b1252f28700bcac181b241bcc6f64601013d;hp=23a3fc78f43e536a03b66373d4d92b29f88b708a

Renaming _main() [mingw32 only] to real_main(), for ANSI compliance.
---

diff --git a/jcc.c b/jcc.c
index 651b83a4..308c5e3c 100644
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.31 2001/07/29 12:17:48 oes Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.32 2001/07/29 18:47:05 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,9 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.31 2001/07/29 12:17:48 oes Exp $";
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.32  2001/07/29 18:47:05  jongfoster
+ *    Adding missing #include "loadcfg.h"
+ *
  *    Revision 1.31  2001/07/29 12:17:48  oes
  *    Applied pthread fix by Paul Lieverse
  *
@@ -1167,7 +1170,7 @@ static int32 server_thread(void *data)
  *
  *********************************************************************/
 #ifdef __MINGW32__
-int _main(int argc, const char *argv[])
+int real_main(int argc, const char *argv[])
 #else
 int main(int argc, const char *argv[])
 #endif
diff --git a/jcc.h b/jcc.h
index 202aa58e..56e6724a 100644
--- a/jcc.h
+++ b/jcc.h
@@ -1,6 +1,6 @@
 #ifndef JCC_H_INCLUDED
 #define JCC_H_INCLUDED
-#define JCC_H_VERSION "$Id: jcc.h,v 1.3 2001/07/18 12:31:58 oes Exp $"
+#define JCC_H_VERSION "$Id: jcc.h,v 1.4 2001/07/29 18:58:15 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.h,v $
@@ -35,6 +35,10 @@
  *
  * Revisions   :
  *    $Log: jcc.h,v $
+ *    Revision 1.4  2001/07/29 18:58:15  jongfoster
+ *    Removing nested #includes, adding forward declarations for needed
+ *    structures, and changing the #define _FILENAME_H to FILENAME_H_INCLUDED.
+ *
  *    Revision 1.3  2001/07/18 12:31:58  oes
  *    moved #define freez from jcc.h to project.h
  *
@@ -74,7 +78,7 @@ extern struct file_list    files[];
 /* Functions */
 
 #ifdef __MINGW32__
-int _main(int argc, const char *argv[]);
+int real_main(int argc, const char *argv[]);
 #else
 int main(int argc, const char *argv[]);
 #endif
diff --git a/win32.c b/win32.c
index 2252dc1f..ecb049a4 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.1.1.1 2001/05/15 13:59:08 oes 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,9 @@ 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.1.1.1  2001/05/15 13:59:08  oes
+ *    Initial import of version 2.9.3 source tree
+ *
  *
  *********************************************************************/
 
@@ -164,7 +167,7 @@ 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