avoid compiler warnings from HAVE_BLAH_H conflicts by renaming macros

dtool/Config.FreeBSD.pp

@@ -58,7 +58,7 @@
 #define HAVE_GETOPT_LONG_ONLY
 
 // Are the above getopt() functions defined in getopt.h, or somewhere else?
-#define HAVE_GETOPT_H 1
+#define PHAVE_GETOPT_H 1
 
 // Can we determine the terminal width by making an ioctl(TIOCGWINSZ) call?
 #define IOCTL_TERMINAL_WIDTH 1
@@ -94,13 +94,13 @@
 #define HAVE_PROC_CURPROC_MAP 1
 #define HAVE_PROC_CURPROC_CMDLINE 1
 
-// Should we include <iostream> or <iostream.h>?  Define HAVE_IOSTREAM
+// Should we include <iostream> or <iostream.h>?  Define PHAVE_IOSTREAM
 // to nonempty if we should use <iostream>, or empty if we should use
 // <iostream.h>.
-#define HAVE_IOSTREAM 1
+#define PHAVE_IOSTREAM 1
 
 // Do we have a true stringstream class defined in <sstream>?
-#define HAVE_SSTREAM 1
+#define PHAVE_SSTREAM 1
 
 // Does fstream::open() require a third parameter, specifying the
 // umask?  Versions of gcc prior to 3.2 had this.
@@ -114,46 +114,46 @@
 #define HAVE_WSTRING 1
 
 // Do we have <new>?
-#define HAVE_NEW 1
+#define PHAVE_NEW 1
 
 // Do we have <io.h>?
-#define HAVE_IO_H
+#define PHAVE_IO_H
 
 // Do we have <malloc.h>?
-//#define HAVE_MALLOC_H
-#define HAVE_SYS_MALLOC_H 1
+//#define PHAVE_MALLOC_H
+#define PHAVE_SYS_MALLOC_H 1
 
 // Do we have <alloca.h>?
-#define HAVE_ALLOCA_H
+#define PHAVE_ALLOCA_H
 
 // Do we have <locale.h>?
-#define HAVE_LOCALE_H 1
+#define PHAVE_LOCALE_H 1
 
 // Do we have <minmax.h>?
-#define HAVE_MINMAX_H
+#define PHAVE_MINMAX_H
 
 // Do we have <sys/types.h>?
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_TIME_H 1
+#define PHAVE_SYS_TYPES_H 1
+#define PHAVE_SYS_TIME_H 1
 
 // Do we have <unistd.h>?
-#define HAVE_UNISTD_H 1
+#define PHAVE_UNISTD_H 1
 
 // Do we have <utime.h>?
-#define HAVE_UTIME_H 1
+#define PHAVE_UTIME_H 1
 
 // Do we have <dirent.h>?
-#define HAVE_DIRENT_H 1
+#define PHAVE_DIRENT_H 1
 
 // Do we have <glob.h> (and do we want to use it instead of dirent.h)?
-#define HAVE_GLOB_H 1
+#define PHAVE_GLOB_H 1
 
 // Do we have <sys/soundcard.h> (and presumably a Linux-style audio
 // interface)?
-#define HAVE_SYS_SOUNDCARD_H 1
+#define PHAVE_SYS_SOUNDCARD_H 1
 
 // Do we have <ucontext.h> (and therefore makecontext() / swapcontext())?
-#define HAVE_UCONTEXT_H
+#define PHAVE_UCONTEXT_H
 
 // Do we have RTTI (and <typeinfo>)?
 #define HAVE_RTTI 1

dtool/Config.Irix.pp

@@ -53,7 +53,7 @@
 #define HAVE_GETOPT_LONG_ONLY
 
 // Are the above getopt() functions defined in getopt.h, or somewhere else?
-#define HAVE_GETOPT_H 1
+#define PHAVE_GETOPT_H 1
 
 // Can we determine the terminal width by making an ioctl(TIOCGWINSZ) call?
 #define IOCTL_TERMINAL_WIDTH 1
@@ -83,13 +83,13 @@
 // command-line arguments at static init time?
 #define HAVE_PROC_SELF_CMDLINE
 
-// Should we include <iostream> or <iostream.h>?  Define HAVE_IOSTREAM
+// Should we include <iostream> or <iostream.h>?  Define PHAVE_IOSTREAM
 // to nonempty if we should use <iostream>, or empty if we should use
 // <iostream.h>.
-#define HAVE_IOSTREAM
+#define PHAVE_IOSTREAM
 
 // Do we have a true stringstream class defined in <sstream>?
-#define HAVE_SSTREAM
+#define PHAVE_SSTREAM
 
 // Does fstream::open() require a third parameter, specifying the
 // umask?
@@ -103,39 +103,39 @@
 #define HAVE_WSTRING 1
 
 // Do we have <new>?
-#define HAVE_NEW
+#define PHAVE_NEW
 
 // Do we have <io.h>?
-#define HAVE_IO_H
+#define PHAVE_IO_H
 
 // Do we have <malloc.h>?
-#define HAVE_MALLOC_H 1
+#define PHAVE_MALLOC_H 1
 
 // Do we have <alloca.h>?
-#define HAVE_ALLOCA_H 1
+#define PHAVE_ALLOCA_H 1
 
 // Do we have <locale.h>?
-#define HAVE_LOCALE_H 1
+#define PHAVE_LOCALE_H 1
 
 // Do we have <minmax.h>?
-#define HAVE_MINMAX_H
+#define PHAVE_MINMAX_H
 
 // Do we have <sys/types.h>?
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_TIME_H 1
+#define PHAVE_SYS_TYPES_H 1
+#define PHAVE_SYS_TIME_H 1
 
 // Do we have <unistd.h>?
-#define HAVE_UNISTD_H 1
+#define PHAVE_UNISTD_H 1
 
 // Do we have <utime.h>?
-#define HAVE_UTIME_H 1
+#define PHAVE_UTIME_H 1
 
 // Do we have <dirent.h>?
-#define HAVE_DIRENT_H 1
+#define PHAVE_DIRENT_H 1
 
 // Do we have <sys/soundcard.h> (and presumably a Linux-style audio
 // interface)?
-#define HAVE_SYS_SOUNDCARD_H
+#define PHAVE_SYS_SOUNDCARD_H
 
 // Do we have RTTI (and <typeinfo>)?
 #define HAVE_RTTI 1

dtool/Config.Linux.pp

@@ -220,7 +220,7 @@
 #define HAVE_GETOPT_LONG_ONLY 1
 
 // Are the above getopt() functions defined in getopt.h, or somewhere else?
-#define HAVE_GETOPT_H 1
+#define PHAVE_GETOPT_H 1
 
 // Can we determine the terminal width by making an ioctl(TIOCGWINSZ) call?
 #define IOCTL_TERMINAL_WIDTH 1
@@ -249,13 +249,13 @@
 #define GLOBAL_ARGV
 #define GLOBAL_ARGC
 
-// Should we include <iostream> or <iostream.h>?  Define HAVE_IOSTREAM
+// Should we include <iostream> or <iostream.h>?  Define PHAVE_IOSTREAM
 // to nonempty if we should use <iostream>, or empty if we should use
 // <iostream.h>.
-#define HAVE_IOSTREAM 1
+#define PHAVE_IOSTREAM 1
 
 // Do we have a true stringstream class defined in <sstream>?
-#define HAVE_SSTREAM 1
+#define PHAVE_SSTREAM 1
 
 // Does fstream::open() require a third parameter, specifying the
 // umask?  Versions of gcc prior to 3.2 had this.
@@ -269,57 +269,57 @@
 #define HAVE_WSTRING 1
 
 // Do we have <new>?
-#define HAVE_NEW 1
+#define PHAVE_NEW 1
 
 // Do we have <io.h>?
-#define HAVE_IO_H
+#define PHAVE_IO_H
 
 // Do we have <malloc.h>?
-#define HAVE_MALLOC_H 1
+#define PHAVE_MALLOC_H 1
 
 // Do we have <alloca.h>?
-#define HAVE_ALLOCA_H 1
+#define PHAVE_ALLOCA_H 1
 
 // Do we have <locale.h>?
-#define HAVE_LOCALE_H 1
+#define PHAVE_LOCALE_H 1
 
 // Do we have <string.h>?
-#define HAVE_STRING_H 1
+#define PHAVE_STRING_H 1
 
 // Do we have <stdlib.h>?
-#define HAVE_STDLIB_H 1
+#define PHAVE_STDLIB_H 1
 
 // Do we have <limits.h>?
-#define HAVE_LIMITS_H 1
+#define PHAVE_LIMITS_H 1
 
 // Do we have <minmax.h>?
-#define HAVE_MINMAX_H
+#define PHAVE_MINMAX_H
 
 // Do we have <sys/types.h>?
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_TIME_H 1
+#define PHAVE_SYS_TYPES_H 1
+#define PHAVE_SYS_TIME_H 1
 
 // Do we have <unistd.h>?
-#define HAVE_UNISTD_H 1
+#define PHAVE_UNISTD_H 1
 
 // Do we have <utime.h>?
-#define HAVE_UTIME_H 1
+#define PHAVE_UTIME_H 1
 
 // Do we have <dirent.h>?
-#define HAVE_DIRENT_H 1
+#define PHAVE_DIRENT_H 1
 
 // Do we have <glob.h> (and do we want to use it instead of dirent.h)?
-#define HAVE_GLOB_H 1
+#define PHAVE_GLOB_H 1
 
 // Do we have <sys/soundcard.h> (and presumably a Linux-style audio
 // interface)?
-#define HAVE_SYS_SOUNDCARD_H 1
+#define PHAVE_SYS_SOUNDCARD_H 1
 
 // Do we have <ucontext.h> (and therefore makecontext() / swapcontext())?
-#define HAVE_UCONTEXT_H 1
+#define PHAVE_UCONTEXT_H 1
 
 // Do we have <linux/input.h> ? This enables us to use raw mouse input.
-#define HAVE_LINUX_INPUT_H 1
+#define PHAVE_LINUX_INPUT_H 1
 
 // Do we have RTTI (and <typeinfo>)?
 #define HAVE_RTTI 1

dtool/Config.OSX.pp

@@ -172,7 +172,7 @@
 #define HAVE_GETOPT_LONG_ONLY 
 
 // Are the above getopt() functions defined in getopt.h, or somewhere else?
-#define HAVE_GETOPT_H 1
+#define PHAVE_GETOPT_H 1
 
 // Can we determine the terminal width by making an ioctl(TIOCGWINSZ) call?
 #define IOCTL_TERMINAL_WIDTH 1
@@ -201,13 +201,13 @@
 #define GLOBAL_ARGV __Argv
 #define GLOBAL_ARGC __Argc
 
-// Should we include <iostream> or <iostream.h>?  Define HAVE_IOSTREAM
+// Should we include <iostream> or <iostream.h>?  Define PHAVE_IOSTREAM
 // to nonempty if we should use <iostream>, or empty if we should use
 // <iostream.h>.
-#define HAVE_IOSTREAM 1
+#define PHAVE_IOSTREAM 1
 
 // Do we have a true stringstream class defined in <sstream>?
-#define HAVE_SSTREAM 1
+#define PHAVE_SSTREAM 1
 
 // Does fstream::open() require a third parameter, specifying the
 // umask?  Versions of gcc prior to 3.2 had this.
@@ -221,54 +221,54 @@
 #define HAVE_WSTRING 1
 
 // Do we have <new>?
-#define HAVE_NEW 1
+#define PHAVE_NEW 1
 
 // Do we have <io.h>?
-#define HAVE_IO_H
+#define PHAVE_IO_H
 
 // Do we have <malloc.h>?
-#define HAVE_MALLOC_H
+#define PHAVE_MALLOC_H
 
 // Do we have <alloca.h>?
-#define HAVE_ALLOCA_H 1
+#define PHAVE_ALLOCA_H 1
 
 // Do we have <locale.h>?
-#define HAVE_LOCALE_H 1
+#define PHAVE_LOCALE_H 1
 
 // Do we have <string.h>?
-#define HAVE_STRING_H 1
+#define PHAVE_STRING_H 1
 
 // Do we have <stdlib.h>?
-#define HAVE_STDLIB_H 1
+#define PHAVE_STDLIB_H 1
 
 // Do we have <limits.h>?
-#define HAVE_LIMITS_H 1
+#define PHAVE_LIMITS_H 1
 
 // Do we have <minmax.h>?
-#define HAVE_MINMAX_H
+#define PHAVE_MINMAX_H
 
 // Do we have <sys/types.h>?
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_TIME_H 1
+#define PHAVE_SYS_TYPES_H 1
+#define PHAVE_SYS_TIME_H 1
 
 // Do we have <unistd.h>?
-#define HAVE_UNISTD_H 1
+#define PHAVE_UNISTD_H 1
 
 // Do we have <utime.h>?
-#define HAVE_UTIME_H 1
+#define PHAVE_UTIME_H 1
 
 // Do we have <dirent.h>?
-#define HAVE_DIRENT_H 1
+#define PHAVE_DIRENT_H 1
 
 // Do we have <glob.h> (and do we want to use it instead of dirent.h)?
-#define HAVE_GLOB_H 1
+#define PHAVE_GLOB_H 1
 
 // Do we have <sys/soundcard.h> (and presumably a Linux-style audio
 // interface)?
-#define HAVE_SYS_SOUNDCARD_H 1
+#define PHAVE_SYS_SOUNDCARD_H 1
 
 // Do we have <ucontext.h> (and therefore makecontext() / swapcontext())?
-#define HAVE_UCONTEXT_H 1
+#define PHAVE_UCONTEXT_H 1
 
 // Do we have RTTI (and <typeinfo>)?
 #define HAVE_RTTI 1

dtool/Config.Win32.pp

@@ -59,7 +59,7 @@
 #define HAVE_GETOPT_LONG_ONLY
 
 // Are the above getopt() functions defined in getopt.h, or somewhere else?
-#define HAVE_GETOPT_H
+#define PHAVE_GETOPT_H
 
 // Can we determine the terminal width by making an ioctl(TIOCGWINSZ) call?
 #define IOCTL_TERMINAL_WIDTH
@@ -88,13 +88,13 @@
 #define GLOBAL_ARGV __argv
 #define GLOBAL_ARGC __argc
 
-// Should we include <iostream> or <iostream.h>?  Define HAVE_IOSTREAM
+// Should we include <iostream> or <iostream.h>?  Define PHAVE_IOSTREAM
 // to nonempty if we should use <iostream>, or empty if we should use
 // <iostream.h>.
-#define HAVE_IOSTREAM 1
+#define PHAVE_IOSTREAM 1
 
 // Do we have a true stringstream class defined in <sstream>?
-#define HAVE_SSTREAM 1
+#define PHAVE_SSTREAM 1
 
 // Does fstream::open() require a third parameter, specifying the
 // umask?
@@ -108,51 +108,51 @@
 #define HAVE_WSTRING 1
 
 // Do we have <new>?
-#define HAVE_NEW 1
+#define PHAVE_NEW 1
 
 // Do we have <io.h>?
-#define HAVE_IO_H 1
+#define PHAVE_IO_H 1
 
 // Do we have <malloc.h>?
-#define HAVE_MALLOC_H 1
+#define PHAVE_MALLOC_H 1
 
 // Do we have <alloca.h>?
-#define HAVE_ALLOCA_H
+#define PHAVE_ALLOCA_H
 
 // Do we have <locale.h>?
-#define HAVE_LOCALE_H
+#define PHAVE_LOCALE_H
 
 // Do we have <string.h>?
-#define HAVE_STRING_H 1
+#define PHAVE_STRING_H 1
 
 // Do we have <stdlib.h>?
-#define HAVE_STDLIB_H
+#define PHAVE_STDLIB_H
 
 // Do we have <limits.h>?
-#define HAVE_LIMITS_H
+#define PHAVE_LIMITS_H
 
 // Do we have <minmax.h>?
-#define HAVE_MINMAX_H 1
+#define PHAVE_MINMAX_H 1
 
 // Do we have <sys/types.h>?
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_TIME_H
+#define PHAVE_SYS_TYPES_H 1
+#define PHAVE_SYS_TIME_H
 
 // Do we have <unistd.h>?
-#define HAVE_UNISTD_H
+#define PHAVE_UNISTD_H
 
 // Do we have <utime.h>?
-#define HAVE_UTIME_H
+#define PHAVE_UTIME_H
 
 // Do we have <dirent.h>?
-#define HAVE_DIRENT_H
+#define PHAVE_DIRENT_H
 
 // Do we have <sys/soundcard.h> (and presumably a Linux-style audio
 // interface)?
-#define HAVE_SYS_SOUNDCARD_H
+#define PHAVE_SYS_SOUNDCARD_H
 
 // Do we have <ucontext.h> (and therefore makecontext() / swapcontext())?
-#define HAVE_UCONTEXT_H
+#define PHAVE_UCONTEXT_H
 
 // Do we have RTTI (and <typeinfo>)?
 #define HAVE_RTTI 1

dtool/Config.pp

@@ -498,7 +498,7 @@
 #defer HAVE_FFTW $[libtest $[FFTW_LPATH],$[FFTW_LIBS]]
 // This is because darwinport's version of the fftw lib is called
 // drfftw instead of rfftw.
-#defer HAVE_DRFFTW_H $[libtest $[FFTW_LPATH],drfftw]
+#defer PHAVE_DRFFTW_H $[libtest $[FFTW_LPATH],drfftw]
 
 // Is libsquish installed, and where?
 #define SQUISH_IPATH /usr/local/include

dtool/LocalSetup.pp

@@ -547,72 +547,72 @@ $[cdefine GLOBAL_ARGV]
 $[cdefine GLOBAL_ARGC]
 
 /* Define if you have the <io.h> header file.  */
-$[cdefine HAVE_IO_H]
+$[cdefine PHAVE_IO_H]
 
 /* Define if you have the <iostream> header file.  */
-$[cdefine HAVE_IOSTREAM]
+$[cdefine PHAVE_IOSTREAM]
 
 /* Define if you have the <malloc.h> header file.  */
-$[cdefine HAVE_MALLOC_H]
+$[cdefine PHAVE_MALLOC_H]
 
 /* Define if you have the <sys/malloc.h> header file.  */
-$[cdefine HAVE_SYS_MALLOC_H]
+$[cdefine PHAVE_SYS_MALLOC_H]
 
 /* Define if you have the <alloca.h> header file.  */
-$[cdefine HAVE_ALLOCA_H]
+$[cdefine PHAVE_ALLOCA_H]
 
 /* Define if you have the <locale.h> header file.  */
-$[cdefine HAVE_LOCALE_H]
+$[cdefine PHAVE_LOCALE_H]
 
 /* Define if you have the <string.h> header file.  */
-$[cdefine HAVE_STRING_H]
+$[cdefine PHAVE_STRING_H]
 
 /* Define if you have the <stdlib.h> header file.  */
-$[cdefine HAVE_STDLIB_H]
+$[cdefine PHAVE_STDLIB_H]
 
 /* Define if you have the <limits.h> header file.  */
-$[cdefine HAVE_LIMITS_H]
+$[cdefine PHAVE_LIMITS_H]
 
 /* Define if you have the <minmax.h> header file.  */
-$[cdefine HAVE_MINMAX_H]
+$[cdefine PHAVE_MINMAX_H]
 
 /* Define if you have the <sstream> header file.  */
-$[cdefine HAVE_SSTREAM]
+$[cdefine PHAVE_SSTREAM]
 
 /* Define if you have the <new> header file.  */
-$[cdefine HAVE_NEW]
+$[cdefine PHAVE_NEW]
 
 /* Define if you have the <sys/types.h> header file.  */
-$[cdefine HAVE_SYS_TYPES_H]
+$[cdefine PHAVE_SYS_TYPES_H]
 
 /* Define if you have the <sys/time.h> header file.  */
-$[cdefine HAVE_SYS_TIME_H]
+$[cdefine PHAVE_SYS_TIME_H]
 
 /* Define if you have the <unistd.h> header file.  */
-$[cdefine HAVE_UNISTD_H]
+$[cdefine PHAVE_UNISTD_H]
 
 /* Define if you have the <utime.h> header file.  */
-$[cdefine HAVE_UTIME_H]
+$[cdefine PHAVE_UTIME_H]
 
 /* Define if you have the <glob.h> header file.  */
-$[cdefine HAVE_GLOB_H]
+$[cdefine PHAVE_GLOB_H]
 
 /* Define if you have the <dirent.h> header file.  */
-$[cdefine HAVE_DIRENT_H]
+$[cdefine PHAVE_DIRENT_H]
 
 /* Define if you have the <drfftw.h> header file.  */
-$[cdefine HAVE_DRFFTW_H]
+$[cdefine PHAVE_DRFFTW_H]
 
 /* Do we have <sys/soundcard.h> (and presumably a Linux-style audio
    interface)? */
-$[cdefine HAVE_SYS_SOUNDCARD_H]
+$[cdefine PHAVE_SYS_SOUNDCARD_H]
 
 /* Do we have <ucontext.h> (and therefore makecontext() /
    swapcontext())? */
-$[cdefine HAVE_UCONTEXT_H]
+$[cdefine PHAVE_UCONTEXT_H]
 
 /* Do we have <linux/input.h> ? This enables us to use raw mouse input. */
-$[cdefine HAVE_LINUX_INPUT_H]
+$[cdefine PHAVE_LINUX_INPUT_H]
 
 /* Do we have RTTI (and <typeinfo>)? */
 $[cdefine HAVE_RTTI]

dtool/src/dtoolbase/dtoolbase.h

@@ -106,55 +106,55 @@
 #define _LARGEFILE_SOURCE 1
 #endif
 
-#ifdef HAVE_TYPES_H
+#ifdef PHAVE_TYPES_H
 #include <types.h>
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
+#ifdef PHAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 
-#ifdef HAVE_MALLOC_H
+#ifdef PHAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
-#ifdef HAVE_SYS_MALLOC_H
+#ifdef PHAVE_SYS_MALLOC_H
 #include <sys/malloc.h>
 #endif
 
-#ifdef HAVE_ALLOCA_H
+#ifdef PHAVE_ALLOCA_H
 #include <alloca.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
+#ifdef PHAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_IO_H
+#ifdef PHAVE_IO_H
 #include <io.h>
 #endif
 
-#ifdef HAVE_LOCALE_H
+#ifdef PHAVE_LOCALE_H
 #include <locale.h>
 #endif
 
-#ifdef HAVE_STRING_H
+#ifdef PHAVE_STRING_H
 #include <string.h>
 #endif
 
-#ifdef HAVE_STDLIB_H
+#ifdef PHAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 
-#ifdef HAVE_LIMITS_H
+#ifdef PHAVE_LIMITS_H
 #include <limits.h>
 #endif
 
-#ifdef HAVE_MINMAX_H
+#ifdef PHAVE_MINMAX_H
 #include <minmax.h>
 #endif
 
-#ifdef HAVE_SYS_TIME_H
+#ifdef PHAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 

dtool/src/dtoolbase/dtoolbase_cc.h

@@ -45,7 +45,7 @@ typedef int ios_seekdir;
 
 #else  // CPPPARSER
 
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
 #include <iostream>
 #include <fstream>
 #include <iomanip>
@@ -55,13 +55,13 @@ typedef int ios_seekdir;
 #include <iomanip.h>
 #endif
 
-#ifdef HAVE_SSTREAM
+#ifdef PHAVE_SSTREAM
 #include <sstream>
 #else
 #include "fakestringstream.h"
 #endif
 
-#ifdef HAVE_NEW
+#ifdef PHAVE_NEW
 #include <new>
 #endif
 

dtool/src/dtoolutil/pandaFileStreamBuf.cxx

@@ -47,7 +47,7 @@ PandaFileStreamBuf() {
   _fd = -1;
 #endif  // _WIN32
 
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
   _buffer = (char *)PANDA_MALLOC_ARRAY(file_buffer_size * 2);
   char *ebuf = _buffer + file_buffer_size * 2;
   char *mbuf = _buffer + file_buffer_size;
@@ -77,7 +77,7 @@ PandaFileStreamBuf() {
 PandaFileStreamBuf::
 ~PandaFileStreamBuf() {
   close();
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
   PANDA_FREE_ARRAY(_buffer);
 #endif
 }

dtool/src/dtoolutil/pandaSystem.cxx

@@ -60,23 +60,51 @@ get_version_string() {
 //     Function: PandaSystem::get_package_version_string
 //       Access: Published, Static
 //  Description: Returns the version of the Panda3D distributable
-//               package associated with this build.  This version
-//               string is set by the builder at compile time;
-//               presumably the person who sets this is also
-//               responsible for building the indicated distributable
-//               package version.
+//               package that provides this build of Panda.
 //
-//               If this string is empty, there is no distributable
-//               package associated with this build, and you should
-//               probably use a different build of Panda3D to generate
-//               your distributable applications to ensure
-//               compatibility.
+//               When the currently-executing version of Panda was
+//               loaded from a distributable package, such as via the
+//               browser plugin, then this string will be nonempty and
+//               will contain the corresponding version string.  You
+//               can build applications that use this particular
+//               version of Panda by requesting it in the pdef file,
+//               using "panda3d", this version string, and the
+//               download host provided by get_package_host_url().
+//
+//               If this string is empty, then the currently-executing
+//               Panda was built independently, and is not part of a
+//               distributable package.
+//
+//               This string is set explicitly at compilation time.
+//               Normally, it should be set to a nonempty string only
+//               when building a Panda3D package for distribution.
 ////////////////////////////////////////////////////////////////////
 string PandaSystem::
 get_package_version_string() {
   return PANDA_PACKAGE_VERSION_STR;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: PandaSystem::get_package_host_url
+//       Access: Published, Static
+//  Description: Returns the URL of the download server that provides
+//               the Panda3D distributable package currently running.
+//               This can be used, along with the
+//               get_package_version_string(), to uniquely identify
+//               the running version of Panda among distributable
+//               Panda versions.
+//
+//               See get_package_version_string() for more information.
+//
+//               This string is set explicitly at compilation time.
+//               Normally, it should be set to a nonempty string only
+//               when building a Panda3D package for distribution.
+////////////////////////////////////////////////////////////////////
+string PandaSystem::
+get_package_host_url() {
+  return PANDA_PACKAGE_HOST_URL;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: PandaSystem::get_major_version
 //       Access: Published, Static

dtool/src/dtoolutil/pandaSystem.h

@@ -34,6 +34,7 @@ protected:
 PUBLISHED:
   static string get_version_string();
   static string get_package_version_string();
+  static string get_package_host_url();
 
   static int get_major_version();
   static int get_minor_version();

dtool/src/dtoolutil/pandaVersion.h.pp

@@ -65,6 +65,11 @@ $[cdefine PANDA_OFFICIAL_VERSION]
    package. */
 # define PANDA_PACKAGE_VERSION_STR "$[PANDA_PACKAGE_VERSION]"
 
+/* The string indicating the URL from which the associated Panda3D
+   distributable package may be downloaded, or empty string if there
+   is no associated package. */
+# define PANDA_PACKAGE_HOST_URL "$[PANDA_PACKAGE_HOST_URL]"
+
 #end pandaVersion.h
 
 

dtool/src/dtoolutil/pfstreamBuf.cxx

@@ -20,7 +20,7 @@ PipeStreamBuf::PipeStreamBuf(PipeStreamBuf::Direction dir) :
 {
   init_pipe();
 
-#ifndef HAVE_IOSTREAM
+#ifndef PHAVE_IOSTREAM
   // These lines, which are essential on older implementations of the
   // iostream library, are not understood by more recent versions.
   allocate();
@@ -30,7 +30,7 @@ PipeStreamBuf::PipeStreamBuf(PipeStreamBuf::Direction dir) :
   } else {
     setp(base(), ebuf());
   }
-#endif /* HAVE_IOSTREAM */
+#endif /* PHAVE_IOSTREAM */
 }
 
 PipeStreamBuf::
@@ -104,22 +104,22 @@ int PipeStreamBuf::underflow(void) {
   if (eof_pipe()) {
     return EOF;
   }
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
   size_t len = 4096;
-#else /* HAVE_IOSTREAM */
+#else /* PHAVE_IOSTREAM */
   size_t len = ebuf() - base();
-#endif /* HAVE_IOSTREAM */
+#endif /* PHAVE_IOSTREAM */
   char* buf = new char[len];
   size_t n = read_pipe(buf, len);
   int ret = buf[0];
   if (n == 0)
     ret = EOF;
   else {
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
     memcpy(eback()+(len-n), buf, n);
-#else /* HAVE_IOSTREAM */
+#else /* PHAVE_IOSTREAM */
     memcpy(base()+(len-n), buf, n);
-#endif /* HAVE_IOSTREAM */
+#endif /* PHAVE_IOSTREAM */
     gbump(-((int)n));
   }
   delete buf;

dtool/src/prc/encryptStreamBuf.cxx

@@ -83,7 +83,7 @@ EncryptStreamBuf() {
   _read_overflow_buffer = NULL;
   _in_read_overflow_buffer = 0;
 
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
   char *buf = new char[4096];
   char *ebuf = buf + 4096;
   setg(buf, ebuf, ebuf);

dtool/src/prc/notify.cxx

@@ -111,7 +111,7 @@ get_literal_flag() {
   static ios_fmtflags flag;
 
   if (!got_flag) {
-#ifndef HAVE_IOSTREAM
+#ifndef PHAVE_IOSTREAM
     flag = ios::bitalloc();
 #else
     // We lost bitalloc in the new iostream?  Ok, this feature will

makepanda/makepanda.py

@@ -1050,8 +1050,8 @@ DTOOL_CONFIG=[
     ("GETTIMEOFDAY_ONE_PARAM",         'UNDEF',                  'UNDEF'),
     ("HAVE_GETOPT",                    'UNDEF',                  '1'),
     ("HAVE_GETOPT_LONG_ONLY",          'UNDEF',                  '1'),
-    ("HAVE_GETOPT_H",                  'UNDEF',                  '1'),
-    ("HAVE_LINUX_INPUT_H",             'UNDEF',                  '1'),
+    ("PHAVE_GETOPT_H",                 'UNDEF',                  '1'),
+    ("PHAVE_LINUX_INPUT_H",            'UNDEF',                  '1'),
     ("IOCTL_TERMINAL_WIDTH",           'UNDEF',                  '1'),
     ("HAVE_STREAMSIZE",                '1',                      '1'),
     ("HAVE_IOS_TYPEDEFS",              '1',                      '1'),
@@ -1068,26 +1068,26 @@ DTOOL_CONFIG=[
     ("PROTOTYPE_GLOBAL_ARGV",          'UNDEF',                  'UNDEF'),
     ("GLOBAL_ARGV",                    '__argv',                 'UNDEF'),
     ("GLOBAL_ARGC",                    '__argc',                 'UNDEF'),
-    ("HAVE_IO_H",                      '1',                      'UNDEF'),
-    ("HAVE_IOSTREAM",                  '1',                      '1'),
-    ("HAVE_STRING_H",                  'UNDEF',                  '1'),
-    ("HAVE_LIMITS_H",                  'UNDEF',                  '1'),
-    ("HAVE_STDLIB_H",                  'UNDEF',                  '1'),
-    ("HAVE_MALLOC_H",                  '1',                      '1'),
-    ("HAVE_SYS_MALLOC_H",              'UNDEF',                  'UNDEF'),
-    ("HAVE_ALLOCA_H",                  'UNDEF',                  '1'),
-    ("HAVE_LOCALE_H",                  'UNDEF',                  '1'),
-    ("HAVE_MINMAX_H",                  '1',                      'UNDEF'),
-    ("HAVE_SSTREAM",                   '1',                      '1'),
-    ("HAVE_NEW",                       '1',                      '1'),
-    ("HAVE_SYS_TYPES_H",               '1',                      '1'),
-    ("HAVE_SYS_TIME_H",                'UNDEF',                  '1'),
-    ("HAVE_UNISTD_H",                  'UNDEF',                  '1'),
-    ("HAVE_UTIME_H",                   'UNDEF',                  '1'),
-    ("HAVE_GLOB_H",                    'UNDEF',                  '1'),
-    ("HAVE_DIRENT_H",                  'UNDEF',                  '1'),
-    ("HAVE_SYS_SOUNDCARD_H",           'UNDEF',                  '1'),
-    ("HAVE_UCONTEXT_H",                'UNDEF',                  '1'),
+    ("PHAVE_IO_H",                     '1',                      'UNDEF'),
+    ("PHAVE_IOSTREAM",                 '1',                      '1'),
+    ("PHAVE_STRING_H",                 'UNDEF',                  '1'),
+    ("PHAVE_LIMITS_H",                 'UNDEF',                  '1'),
+    ("PHAVE_STDLIB_H",                 'UNDEF',                  '1'),
+    ("PHAVE_MALLOC_H",                 '1',                      '1'),
+    ("PHAVE_SYS_MALLOC_H",             'UNDEF',                  'UNDEF'),
+    ("PHAVE_ALLOCA_H",                 'UNDEF',                  '1'),
+    ("PHAVE_LOCALE_H",                 'UNDEF',                  '1'),
+    ("PHAVE_MINMAX_H",                 '1',                      'UNDEF'),
+    ("PHAVE_SSTREAM",                  '1',                      '1'),
+    ("PHAVE_NEW",                      '1',                      '1'),
+    ("PHAVE_SYS_TYPES_H",              '1',                      '1'),
+    ("PHAVE_SYS_TIME_H",               'UNDEF',                  '1'),
+    ("PHAVE_UNISTD_H",                 'UNDEF',                  '1'),
+    ("PHAVE_UTIME_H",                  'UNDEF',                  '1'),
+    ("PHAVE_GLOB_H",                   'UNDEF',                  '1'),
+    ("PHAVE_DIRENT_H",                 'UNDEF',                  '1'),
+    ("PHAVE_SYS_SOUNDCARD_H",          'UNDEF',                  '1'),
+    ("PHAVE_UCONTEXT_H",               'UNDEF',                  '1'),
     ("HAVE_RTTI",                      '1',                      '1'),
     ("HAVE_X11",                       'UNDEF',                  '1'),
     ("HAVE_XF86DGA",                   'UNDEF',                  '1'),
@@ -1191,8 +1191,8 @@ def WriteConfigSettings():
     
     if (sys.platform == "darwin"):
         dtool_config["PYTHON_FRAMEWORK"] = 'Python'
-        dtool_config["HAVE_MALLOC_H"] = 'UNDEF'
-        dtool_config["HAVE_SYS_MALLOC_H"] = '1'
+        dtool_config["PHAVE_MALLOC_H"] = 'UNDEF'
+        dtool_config["PHAVE_SYS_MALLOC_H"] = '1'
         dtool_config["HAVE_OPENAL_FRAMEWORK"] = '1'
         dtool_config["HAVE_X11"] = 'UNDEF'  # We might have X11, but we don't need it.
         dtool_config["HAVE_XF86DGA"] = 'UNDEF'
@@ -1202,9 +1202,9 @@ def WriteConfigSettings():
     if (sys.platform.startswith("freebsd")):
         dtool_config["IS_LINUX"] = 'UNDEF'
         dtool_config["IS_FREEBSD"] = '1'
-        dtool_config["HAVE_ALLOCA_H"] = 'UNDEF'
-        dtool_config["HAVE_MALLOC_H"] = 'UNDEF'
-        dtool_config["HAVE_LINUX_INPUT_H"] = 'UNDEF'
+        dtool_config["PHAVE_ALLOCA_H"] = 'UNDEF'
+        dtool_config["PHAVE_MALLOC_H"] = 'UNDEF'
+        dtool_config["PHAVE_LINUX_INPUT_H"] = 'UNDEF'
         dtool_config["HAVE_PROC_CURPROC_FILE"] = '1'
         dtool_config["HAVE_PROC_CURPROC_MAP"] = '1'
         dtool_config["HAVE_PROC_CURPROC_CMDLINE"] = '1'
@@ -1305,6 +1305,7 @@ PANDAVERSION_H="""
 #define PANDA_VERSION_STR "VERSION1.VERSION2.VERSION3"
 #define PANDA_DISTRIBUTOR "makepanda"
 #define PANDA_PACKAGE_VERSION_STR ""
+#define PANDA_PACKAGE_HOST_URL ""
 """
 
 CHECKPANDAVERSION_CXX="""

panda/src/downloader/bioStreamBuf.cxx

@@ -40,7 +40,7 @@ BioStreamBuf() {
   _read_open = false;
   _write_open = false;
 
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
   _buffer = (char *)PANDA_MALLOC_ARRAY(8192);
   char *ebuf = _buffer + 8192;
   char *mbuf = _buffer + 4096;
@@ -67,7 +67,7 @@ BioStreamBuf() {
 BioStreamBuf::
 ~BioStreamBuf() {
   close();
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
   PANDA_FREE_ARRAY(_buffer);
 #endif
 }

panda/src/downloader/chunkedStreamBuf.cxx

@@ -36,7 +36,7 @@ ChunkedStreamBuf() {
   _wanted_nonblocking = false;
   _read_state = ISocketStream::RS_initial;
 
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
   _buffer = (char *)PANDA_MALLOC_ARRAY(4096);
   char *ebuf = _buffer + 4096;
   setg(_buffer, ebuf, ebuf);
@@ -57,7 +57,7 @@ ChunkedStreamBuf() {
 ChunkedStreamBuf::
 ~ChunkedStreamBuf() {
   close_read();
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
   PANDA_FREE_ARRAY(_buffer);
 #endif
 }

panda/src/downloader/identityStreamBuf.cxx

@@ -34,7 +34,7 @@ IdentityStreamBuf() {
   _wanted_nonblocking = false;
   _read_state = ISocketStream::RS_initial;
 
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
   _buffer = (char *)PANDA_MALLOC_ARRAY(4096);
   char *ebuf = _buffer + 4096;
   setg(_buffer, ebuf, ebuf);
@@ -55,7 +55,7 @@ IdentityStreamBuf() {
 IdentityStreamBuf::
 ~IdentityStreamBuf() {
   close_read();
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
   PANDA_FREE_ARRAY(_buffer);
 #endif
 }

panda/src/downloader/multiplexStreamBuf.cxx

@@ -91,7 +91,7 @@ write_string(const string &str) {
 ////////////////////////////////////////////////////////////////////
 MultiplexStreamBuf::
 MultiplexStreamBuf() {
-#ifndef HAVE_IOSTREAM
+#ifndef PHAVE_IOSTREAM
   // Older iostream implementations required this.
   allocate();
   setp(base(), ebuf());

panda/src/downloader/stringStreamBuf.cxx

@@ -23,7 +23,7 @@
 ////////////////////////////////////////////////////////////////////
 StringStreamBuf::
 StringStreamBuf() {
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
   _buffer = (char *)PANDA_MALLOC_ARRAY(2048);
   char *ebuf = _buffer + 2048;
   char *mbuf = _buffer + 1024;
@@ -52,7 +52,7 @@ StringStreamBuf() {
 ////////////////////////////////////////////////////////////////////
 StringStreamBuf::
 ~StringStreamBuf() {
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
   PANDA_FREE_ARRAY(_buffer);
 #endif
 }

panda/src/express/subStreamBuf.cxx

@@ -51,7 +51,7 @@ SubStreamBuf() {
   // the unused part of the buffer.
   _unused = 0;
 
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
   // The new-style iostream library doesn't seem to support allocate().
   _buffer = (char *)PANDA_MALLOC_ARRAY(4096);
   char *ebuf = _buffer + 4096;
@@ -71,7 +71,7 @@ SubStreamBuf() {
 SubStreamBuf::
 ~SubStreamBuf() {
   close();
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
   PANDA_FREE_ARRAY(_buffer);
 #endif
 }

panda/src/express/zStreamBuf.cxx

@@ -43,7 +43,7 @@ ZStreamBuf() {
   _dest = (ostream *)NULL;
   _owns_dest = false;
 
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
   _buffer = (char *)PANDA_MALLOC_ARRAY(4096);
   char *ebuf = _buffer + 4096;
   setg(_buffer, ebuf, ebuf);
@@ -65,7 +65,7 @@ ZStreamBuf::
 ~ZStreamBuf() {
   close_read();
   close_write();
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
   PANDA_FREE_ARRAY(_buffer);
 #endif
 }

panda/src/mathutil/fftCompressor.cxx

@@ -32,7 +32,7 @@
 #undef howmany
 #endif
 
-#ifdef HAVE_DRFFTW_H
+#ifdef PHAVE_DRFFTW_H
   #include "drfftw.h"
 #else
   #include "rfftw.h"

pandatool/src/maya/pre_maya_include.h

@@ -59,9 +59,9 @@ typedef istream maya_istream;
 // instead of the old <iostream.h> headers.  It also says this is for
 // Linux only, but it seems to work just fine on Windows, obviating
 // the need for sneaky #defines in this and in post_maya_include.h.
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
 #define REQUIRE_IOSTREAM
-#endif  // HAVE_IOSTREAM
+#endif  // PHAVE_IOSTREAM
 
 #ifdef __MACH__
 #undef _BOOL

pandatool/src/mayaprogs/mayaSavePview.h

@@ -35,11 +35,11 @@
 // make this program platform-independent.
 #include "dtool_config.h"
 
-#ifdef HAVE_IOSTREAM
+#ifdef PHAVE_IOSTREAM
 // This will ask Maya 5.0 or better to use the new <iostream> library
 // instead of the old <iostream.h> library.
 #define REQUIRE_IOSTREAM
-#endif  // HAVE_IOSTREAM
+#endif  // PHAVE_IOSTREAM
 
 #include <maya/MArgList.h>
 #include <maya/MPxCommand.h>