diff options
| author | tjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-04-23 17:39:39 +0000 |
|---|---|---|
| committer | tjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-04-23 17:39:39 +0000 |
| commit | 632f4c431b9c7f0e0c1555a600e5df6c27a6ff6e (patch) | |
| tree | e5f0ae4dbbe3835255925df9c3411c207fbc1c55 /code/tools/lcc/cpp | |
| parent | f1f5acf256dd1f9ec29988ce855b975442c3df2c (diff) | |
| download | ioquake3-aero-632f4c431b9c7f0e0c1555a600e5df6c27a6ff6e.tar.gz ioquake3-aero-632f4c431b9c7f0e0c1555a600e5df6c27a6ff6e.zip | |
* (bug 3611) prevent global symbol conflict on some systems (Mac OS X) for
lcc's getopt (Ben Millwood)
git-svn-id: svn://svn.icculus.org/quake3/trunk@1326 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/tools/lcc/cpp')
| -rw-r--r-- | code/tools/lcc/cpp/getopt.c | 2 | ||||
| -rw-r--r-- | code/tools/lcc/cpp/nlist.c | 1 | ||||
| -rw-r--r-- | code/tools/lcc/cpp/unix.c | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/code/tools/lcc/cpp/getopt.c b/code/tools/lcc/cpp/getopt.c index abcb35f..c4d1af7 100644 --- a/code/tools/lcc/cpp/getopt.c +++ b/code/tools/lcc/cpp/getopt.c @@ -8,7 +8,7 @@ int optopt; 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; diff --git a/code/tools/lcc/cpp/nlist.c b/code/tools/lcc/cpp/nlist.c index d857dfa..d76df86 100644 --- a/code/tools/lcc/cpp/nlist.c +++ b/code/tools/lcc/cpp/nlist.c @@ -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; diff --git a/code/tools/lcc/cpp/unix.c b/code/tools/lcc/cpp/unix.c index 397b1b4..17986d8 100644 --- a/code/tools/lcc/cpp/unix.c +++ b/code/tools/lcc/cpp/unix.c @@ -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 @@ setup(int argc, char **argv) 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++) |