From c30ae4fc997da755236f9380cbab4d15bcb41ff3 Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 21 Aug 2009 17:26:26 +0000 Subject: [PATCH] forgot HAVE_GETOPT_H --- direct/src/plugin_standalone/panda3d.cxx | 2 +- dtool/LocalSetup.pp | 2 +- dtool/src/interrogate/interrogate.cxx | 2 +- dtool/src/interrogate/parse_file.cxx | 2 +- dtool/src/prckeys/makePrcKey.cxx | 2 +- dtool/src/prckeys/signPrcFile_src.cxx | 2 +- dtool/src/test_interrogate/test_interrogate.cxx | 2 +- panda/src/downloadertools/pdecrypt.cxx | 2 +- panda/src/downloadertools/pencrypt.cxx | 2 +- panda/src/downloadertools/punzip.cxx | 2 +- panda/src/downloadertools/pzip.cxx | 2 +- panda/src/testbed/pview.cxx | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/direct/src/plugin_standalone/panda3d.cxx b/direct/src/plugin_standalone/panda3d.cxx index ca66a74a63..39fdad61d9 100644 --- a/direct/src/plugin_standalone/panda3d.cxx +++ b/direct/src/plugin_standalone/panda3d.cxx @@ -30,7 +30,7 @@ #ifndef HAVE_GETOPT #include "gnu_getopt.h" #else - #ifdef HAVE_GETOPT_H + #ifdef PHAVE_GETOPT_H #include #endif #endif diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp index 529a903f7c..d29c6c1c0c 100644 --- a/dtool/LocalSetup.pp +++ b/dtool/LocalSetup.pp @@ -511,7 +511,7 @@ $[cdefine HAVE_GETOPT] $[cdefine HAVE_GETOPT_LONG_ONLY] /* Define if getopt appears in getopt.h. */ -$[cdefine HAVE_GETOPT_H] +$[cdefine PHAVE_GETOPT_H] /* Define if you have ioctl(TIOCGWINSZ) to determine terminal width. */ $[cdefine IOCTL_TERMINAL_WIDTH] diff --git a/dtool/src/interrogate/interrogate.cxx b/dtool/src/interrogate/interrogate.cxx index feaa8a9b7d..f67d047edf 100644 --- a/dtool/src/interrogate/interrogate.cxx +++ b/dtool/src/interrogate/interrogate.cxx @@ -25,7 +25,7 @@ #ifndef HAVE_GETOPT_LONG_ONLY #include "gnu_getopt.h" #else - #ifdef HAVE_GETOPT_H + #ifdef PHAVE_GETOPT_H #include #endif #endif diff --git a/dtool/src/interrogate/parse_file.cxx b/dtool/src/interrogate/parse_file.cxx index f2ee2408b4..9aeeec2a65 100644 --- a/dtool/src/interrogate/parse_file.cxx +++ b/dtool/src/interrogate/parse_file.cxx @@ -27,7 +27,7 @@ #ifndef HAVE_GETOPT_LONG_ONLY #include "gnu_getopt.h" #else - #ifdef HAVE_GETOPT_H + #ifdef PHAVE_GETOPT_H #include #endif #endif diff --git a/dtool/src/prckeys/makePrcKey.cxx b/dtool/src/prckeys/makePrcKey.cxx index d95bcbdaf3..465626e68d 100644 --- a/dtool/src/prckeys/makePrcKey.cxx +++ b/dtool/src/prckeys/makePrcKey.cxx @@ -32,7 +32,7 @@ #ifndef HAVE_GETOPT #include "gnu_getopt.h" #else - #ifdef HAVE_GETOPT_H + #ifdef PHAVE_GETOPT_H #include #endif #endif diff --git a/dtool/src/prckeys/signPrcFile_src.cxx b/dtool/src/prckeys/signPrcFile_src.cxx index 1ae410149a..158521eda7 100644 --- a/dtool/src/prckeys/signPrcFile_src.cxx +++ b/dtool/src/prckeys/signPrcFile_src.cxx @@ -32,7 +32,7 @@ #ifndef HAVE_GETOPT #include "gnu_getopt.h" #else - #ifdef HAVE_GETOPT_H + #ifdef PHAVE_GETOPT_H #include #endif #endif diff --git a/dtool/src/test_interrogate/test_interrogate.cxx b/dtool/src/test_interrogate/test_interrogate.cxx index 61ea73b01c..374c80f7bf 100644 --- a/dtool/src/test_interrogate/test_interrogate.cxx +++ b/dtool/src/test_interrogate/test_interrogate.cxx @@ -25,7 +25,7 @@ #ifndef HAVE_GETOPT #include "gnu_getopt.h" #else - #ifdef HAVE_GETOPT_H + #ifdef PHAVE_GETOPT_H #include #endif #endif diff --git a/panda/src/downloadertools/pdecrypt.cxx b/panda/src/downloadertools/pdecrypt.cxx index 5ee41f4746..d2a0543d89 100644 --- a/panda/src/downloadertools/pdecrypt.cxx +++ b/panda/src/downloadertools/pdecrypt.cxx @@ -19,7 +19,7 @@ #ifndef HAVE_GETOPT #include "gnu_getopt.h" #else - #ifdef HAVE_GETOPT_H + #ifdef PHAVE_GETOPT_H #include #endif #endif diff --git a/panda/src/downloadertools/pencrypt.cxx b/panda/src/downloadertools/pencrypt.cxx index 943382a1f8..ae694c41d0 100644 --- a/panda/src/downloadertools/pencrypt.cxx +++ b/panda/src/downloadertools/pencrypt.cxx @@ -19,7 +19,7 @@ #ifndef HAVE_GETOPT #include "gnu_getopt.h" #else - #ifdef HAVE_GETOPT_H + #ifdef PHAVE_GETOPT_H #include #endif #endif diff --git a/panda/src/downloadertools/punzip.cxx b/panda/src/downloadertools/punzip.cxx index 7e341f6841..0ed0cc9c57 100644 --- a/panda/src/downloadertools/punzip.cxx +++ b/panda/src/downloadertools/punzip.cxx @@ -19,7 +19,7 @@ #ifndef HAVE_GETOPT #include "gnu_getopt.h" #else - #ifdef HAVE_GETOPT_H + #ifdef PHAVE_GETOPT_H #include #endif #endif diff --git a/panda/src/downloadertools/pzip.cxx b/panda/src/downloadertools/pzip.cxx index ce492bf3da..bab81daa6b 100644 --- a/panda/src/downloadertools/pzip.cxx +++ b/panda/src/downloadertools/pzip.cxx @@ -19,7 +19,7 @@ #ifndef HAVE_GETOPT #include "gnu_getopt.h" #else - #ifdef HAVE_GETOPT_H + #ifdef PHAVE_GETOPT_H #include #endif #endif diff --git a/panda/src/testbed/pview.cxx b/panda/src/testbed/pview.cxx index bad866c66e..7cc865f941 100644 --- a/panda/src/testbed/pview.cxx +++ b/panda/src/testbed/pview.cxx @@ -32,7 +32,7 @@ #ifndef HAVE_GETOPT #include "gnu_getopt.h" #else - #ifdef HAVE_GETOPT_H + #ifdef PHAVE_GETOPT_H #include #endif #endif