forgot HAVE_GETOPT_H

drwrose · drwrose · commit c30ae4fc997d · 2009-08-21T17:26:26.000Z
diff --git 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 <getopt.h>
   #endif
 #endif
diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp
@@ -511,7 +511,7 @@
 $[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
@@ -25,7 +25,7 @@
 #ifndef HAVE_GETOPT_LONG_ONLY
   #include "gnu_getopt.h"
 #else
-  #ifdef HAVE_GETOPT_H
+  #ifdef PHAVE_GETOPT_H
     #include <getopt.h>
   #endif
 #endif
diff --git 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 <getopt.h>
   #endif
 #endif
diff --git 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 <getopt.h>
   #endif
 #endif
diff --git 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 <getopt.h>
   #endif
 #endif
diff --git 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 <getopt.h>
   #endif
 #endif
diff --git 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 <getopt.h>
   #endif
 #endif
diff --git 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 <getopt.h>
   #endif
 #endif
diff --git 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 <getopt.h>
   #endif
 #endif
diff --git 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 <getopt.h>
   #endif
 #endif
diff --git 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 <getopt.h>
   #endif
 #endif
