r1326 - trunk/code/tools/lcc/cpp

[DONOTREPLY at icculus.org]

Author: tjw
Date: 2008-04-23 13:39:39 -0400 (Wed, 23 Apr 2008)
New Revision: 1326

Modified:
   trunk/code/tools/lcc/cpp/getopt.c
   trunk/code/tools/lcc/cpp/nlist.c
   trunk/code/tools/lcc/cpp/unix.c
Log:
* (bug 3611) prevent global symbol conflict on some systems (Mac OS X) for
  lcc's getopt (Ben Millwood)


Modified: trunk/code/tools/lcc/cpp/getopt.c
===================================================================
--- trunk/code/tools/lcc/cpp/getopt.c	2008-04-22 08:52:17 UTC (rev 1325)
+++ trunk/code/tools/lcc/cpp/getopt.c	2008-04-23 17:39:39 UTC (rev 1326)
@@ -8,7 +8,7 @@
 char    *optarg;
 
 int
-getopt (int argc, char *const argv[], const char *opts)
+lcc_getopt (int argc, char *const argv[], const char *opts)
 {
 	static int sp = 1;
 	int c;

Modified: trunk/code/tools/lcc/cpp/nlist.c
===================================================================
--- trunk/code/tools/lcc/cpp/nlist.c	2008-04-22 08:52:17 UTC (rev 1325)
+++ trunk/code/tools/lcc/cpp/nlist.c	2008-04-23 17:39:39 UTC (rev 1326)
@@ -3,7 +3,6 @@
 #include <string.h>
 #include "cpp.h"
 
-extern	int getopt(int, char *const *, const char *);
 extern	char	*optarg;
 extern	int	optind;
 extern	int	verbose;

Modified: trunk/code/tools/lcc/cpp/unix.c
===================================================================
--- trunk/code/tools/lcc/cpp/unix.c	2008-04-22 08:52:17 UTC (rev 1325)
+++ trunk/code/tools/lcc/cpp/unix.c	2008-04-23 17:39:39 UTC (rev 1326)
@@ -4,7 +4,7 @@
 #include <string.h>
 #include "cpp.h"
 
-extern	int getopt(int, char *const *, const char *);
+extern	int lcc_getopt(int, char *const *, const char *);
 extern	char	*optarg, rcsid[];
 extern	int	optind;
 int	verbose;
@@ -23,7 +23,7 @@
 	int   numIncludeDirs = 0;
 
 	setup_kwtab();
-	while ((c = getopt(argc, argv, "MNOVv+I:D:U:F:lg")) != -1)
+	while ((c = lcc_getopt(argc, argv, "MNOVv+I:D:U:F:lg")) != -1)
 		switch (c) {
 		case 'N':
 			for (i=0; i<NINCLUDE; i++)