OSX Commit

2025-10-03 18:31:55 -04:00 · 2006-03-17 22:57:38 +00:00 · 2006-03-17 22:57:38 +00:00 · 477fdc8775
commit 477fdc8775
parent 42b3ba9c82
88 changed files with 91 additions and 87 deletions
--- a/panda/src/display/graphicsOutput.h
+++ b/panda/src/display/graphicsOutput.h
@ -29,7 +29,7 @@

 #include "typedWritableReferenceCount.h"
 #include "pStatCollector.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "pmutex.h"
 #include "filename.h"
 #include "drawMask.h"
--- a/panda/src/display/graphicsStateGuardian.h
+++ b/panda/src/display/graphicsStateGuardian.h
@ -39,7 +39,7 @@
 #include "config_display.h"
 #include "geomMunger.h"
 #include "geomVertexData.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "pvector.h"
 #include "attribSlots.h"
 #include "shaderContext.h"
--- a/panda/src/display/graphicsWindow.h
+++ b/panda/src/display/graphicsWindow.h
@ -27,7 +27,7 @@
 #include "mouseData.h"
 #include "modifierButtons.h"
 #include "buttonEvent.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "pmutex.h"
 #include "reMutex.h"
 #include "pvector.h"
--- a/panda/src/display/windowProperties.h
+++ b/panda/src/display/windowProperties.h
@ -21,7 +21,7 @@

 #include "pandabase.h"
 #include "filename.h"
-#include "notify.h"
+#include "pnotify.h"

 ////////////////////////////////////////////////////////////////////
 //       Class : WindowProperties
--- a/panda/src/downloader/asyncUtility.h
+++ b/panda/src/downloader/asyncUtility.h
@ -22,7 +22,7 @@
 // Includes
 ////////////////////////////////////////////////////////////////////
 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "typedef.h"

 #ifdef OLD_HAVE_IPC
--- a/panda/src/downloader/downloadDb.h
+++ b/panda/src/downloader/downloadDb.h
@ -19,7 +19,7 @@
 #define DOWNLOADDB_H

 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "filename.h"
 #include "multifile.h"
 #include "datagram.h"
--- a/panda/src/downloader/multiplexStreamBuf.cxx
+++ b/panda/src/downloader/multiplexStreamBuf.cxx
@ -25,7 +25,7 @@
 #endif

 // We use real assert() instead of nassert(), because we're likely
-// to be invoked directly by notify here, and we don't want to
+// to be invoked directly by pnotify.here, and we don't want to
 // risk infinite recursion.
 #include <assert.h>

--- a/panda/src/downloader/urlSpec.h
+++ b/panda/src/downloader/urlSpec.h
@ -20,7 +20,7 @@
 #define URLSPEC_H

 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"

 ////////////////////////////////////////////////////////////////////
 //       Class : URLSpec
--- a/panda/src/downloadertools/pdecrypt.cxx
+++ b/panda/src/downloadertools/pdecrypt.cxx
@ -18,7 +18,7 @@

 #include "filename.h"
 #include "encryptStream.h"
-#include "notify.h"
+#include "pnotify.h"

 #ifndef HAVE_GETOPT
  #include "gnu_getopt.h"
--- a/panda/src/downloadertools/pencrypt.cxx
+++ b/panda/src/downloadertools/pencrypt.cxx
@ -18,7 +18,7 @@

 #include "filename.h"
 #include "encryptStream.h"
-#include "notify.h"
+#include "pnotify.h"

 #ifndef HAVE_GETOPT
  #include "gnu_getopt.h"
--- a/panda/src/downloadertools/punzip.cxx
+++ b/panda/src/downloadertools/punzip.cxx
@ -18,7 +18,7 @@

 #include "filename.h"
 #include "zStream.h"
-#include "notify.h"
+#include "pnotify.h"

 #ifndef HAVE_GETOPT
  #include "gnu_getopt.h"
--- a/panda/src/downloadertools/pzip.cxx
+++ b/panda/src/downloadertools/pzip.cxx
@ -18,7 +18,7 @@

 #include "filename.h"
 #include "zStream.h"
-#include "notify.h"
+#include "pnotify.h"

 #ifndef HAVE_GETOPT
  #include "gnu_getopt.h"
--- a/panda/src/egg/eggAnimData.I
+++ b/panda/src/egg/eggAnimData.I
@ -16,7 +16,7 @@
 //
 ////////////////////////////////////////////////////////////////////

-#include "notify.h"
+#include "pnotify.h"

 ////////////////////////////////////////////////////////////////////
 //     Function: EggAnimData::Constructor
--- a/panda/src/egg/eggAttributes.h
+++ b/panda/src/egg/eggAttributes.h
@ -25,7 +25,7 @@

 #include "typedObject.h"
 #include "luse.h"
-#include "notify.h"
+#include "pnotify.h"

 ////////////////////////////////////////////////////////////////////
 //       Class : EggAttributes
--- a/panda/src/egg/eggBinMaker.cxx
+++ b/panda/src/egg/eggBinMaker.cxx
@ -22,7 +22,7 @@
 #include "eggBin.h"

 #include "dcast.h"
-#include "notify.h"
+#include "pnotify.h"

 TypeHandle EggBinMaker::_type_handle;

--- a/panda/src/egg/eggBinMaker.h
+++ b/panda/src/egg/eggBinMaker.h
@ -217,7 +217,7 @@
 #include "eggObject.h"

 #include "pointerTo.h"
-#include "notify.h"
+#include "pnotify.h"

 #include "pset.h"
 #include "pmap.h"
--- a/panda/src/egg/eggCurve.cxx
+++ b/panda/src/egg/eggCurve.cxx
@ -19,7 +19,7 @@
 #include "eggCurve.h"

 #include "string_utils.h"
-#include "notify.h"
+#include "pnotify.h"

 TypeHandle EggCurve::_type_handle;

--- a/panda/src/egg/eggData.h
+++ b/panda/src/egg/eggData.h
@ -24,7 +24,7 @@
 #include "eggGroupNode.h"
 #include "filename.h"
 #include "coordinateSystem.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "dSearchPath.h"

 ////////////////////////////////////////////////////////////////////
--- a/panda/src/egg/eggGroupUniquifier.cxx
+++ b/panda/src/egg/eggGroupUniquifier.cxx
@ -19,7 +19,7 @@
 #include "eggGroupUniquifier.h"
 #include "eggGroup.h"

-#include "notify.h"
+#include "pnotify.h"

 #include <ctype.h>

--- a/panda/src/egg/eggMesherFanMaker.h
+++ b/panda/src/egg/eggMesherFanMaker.h
@ -27,7 +27,7 @@
 #include "plist.h"
 #include "pvector.h"

-#include "notify.h"
+#include "pnotify.h"
 #include "mathNumbers.h"

 class EggMesher;
--- a/panda/src/egg/eggNameUniquifier.cxx
+++ b/panda/src/egg/eggNameUniquifier.cxx
@ -22,7 +22,7 @@
 #include "config_egg.h"
 #include "dcast.h"

-#include "notify.h"
+#include "pnotify.h"

 TypeHandle EggNameUniquifier::_type_handle;

--- a/panda/src/egg/eggPoolUniquifier.cxx
+++ b/panda/src/egg/eggPoolUniquifier.cxx
@ -22,7 +22,7 @@
 #include "eggMaterial.h"
 #include "eggVertexPool.h"

-#include "notify.h"
+#include "pnotify.h"

 TypeHandle EggPoolUniquifier::_type_handle;

--- a/panda/src/egg/eggRenderMode.cxx
+++ b/panda/src/egg/eggRenderMode.cxx
@ -19,7 +19,7 @@
 #include "eggRenderMode.h"
 #include "indent.h"
 #include "string_utils.h"
-#include "notify.h"
+#include "pnotify.h"

 TypeHandle EggRenderMode::_type_handle;

--- a/panda/src/egg/test_egg.cxx
+++ b/panda/src/egg/test_egg.cxx
@ -17,7 +17,7 @@
 ////////////////////////////////////////////////////////////////////

 #include "eggData.h"
-#include "notify.h"
+#include "pnotify.h"


 int
--- a/panda/src/express/atomicAdjustDummyImpl.h
+++ b/panda/src/express/atomicAdjustDummyImpl.h
@ -24,7 +24,7 @@

 #ifdef THREAD_DUMMY_IMPL

-#include "notify.h"
+#include "pnotify.h"
 #include "numeric_types.h"

 ////////////////////////////////////////////////////////////////////
--- a/panda/src/express/atomicAdjustNsprImpl.h
+++ b/panda/src/express/atomicAdjustNsprImpl.h
@ -24,7 +24,7 @@

 #ifdef THREAD_NSPR_IMPL

-#include "notify.h"
+#include "pnotify.h"
 #include "numeric_types.h"

 #include <pratom.h>
--- a/panda/src/express/atomicAdjustPosixImpl.h
+++ b/panda/src/express/atomicAdjustPosixImpl.h
@ -24,7 +24,7 @@

 #ifdef THREAD_POSIX_IMPL

-#include "notify.h"
+#include "pnotify.h"
 #include "numeric_types.h"

 #include <pthread.h>
--- a/panda/src/express/atomicAdjustWin32Impl.h
+++ b/panda/src/express/atomicAdjustWin32Impl.h
@ -24,7 +24,7 @@

 #ifdef THREAD_WIN32_IMPL

-#include "notify.h"
+#include "pnotify.h"
 #include "numeric_types.h"

 #include <windows.h>
--- a/panda/src/express/circBuffer.I
+++ b/panda/src/express/circBuffer.I
@ -18,7 +18,7 @@

 #include "pandabase.h"
 #include "config_express.h"
-#include "notify.h"
+#include "pnotify.h"

 ////////////////////////////////////////////////////////////////////
 //     Function: CircBuffer::Constructor
--- a/panda/src/express/conditionVarDummyImpl.h
+++ b/panda/src/express/conditionVarDummyImpl.h
@ -24,7 +24,7 @@

 #ifdef THREAD_DUMMY_IMPL

-#include "notify.h"
+#include "pnotify.h"

 class MutexDummyImpl;

--- a/panda/src/express/conditionVarNsprImpl.h
+++ b/panda/src/express/conditionVarNsprImpl.h
@ -25,7 +25,7 @@
 #ifdef THREAD_NSPR_IMPL

 #include "mutexNsprImpl.h"
-#include "notify.h"
+#include "pnotify.h"

 #include <prcvar.h>

--- a/panda/src/express/conditionVarPosixImpl.h
+++ b/panda/src/express/conditionVarPosixImpl.h
@ -25,7 +25,7 @@
 #ifdef THREAD_POSIX_IMPL

 #include "mutexPosixImpl.h"
-#include "notify.h"
+#include "pnotify.h"

 #include <pthread.h>

--- a/panda/src/express/conditionVarWin32Impl.h
+++ b/panda/src/express/conditionVarWin32Impl.h
@ -25,7 +25,7 @@
 #ifdef THREAD_WIN32_IMPL

 #include "mutexWin32Impl.h"
-#include "notify.h"
+#include "pnotify.h"

 #include <prcvar.h>

--- a/panda/src/express/datagram.cxx
+++ b/panda/src/express/datagram.cxx
@ -19,7 +19,7 @@

 #include "datagram.h"

-#include "notify.h"
+#include "pnotify.h"

 // for sprintf().
 #include <stdio.h>
--- a/panda/src/express/datagramIterator.cxx
+++ b/panda/src/express/datagramIterator.cxx
@ -18,7 +18,7 @@


 #include "datagramIterator.h"
-#include "notify.h"
+#include "pnotify.h"

 ////////////////////////////////////////////////////////////////////
 //     Function: DatagramIterator::get_string
--- a/panda/src/express/express_headers.h
+++ b/panda/src/express/express_headers.h
@ -19,7 +19,7 @@
 #include "pandabase.h"
 #include <errno.h>
 #include <stdio.h>
-#include "notify.h"
+#include "pnotify.h"

 #include "clockObject.h"
 #include "config_express.h"
--- a/panda/src/express/hashVal.h
+++ b/panda/src/express/hashVal.h
@ -21,7 +21,7 @@

 #include "pandabase.h"
 #include "typedef.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "ramfile.h"
 #include "datagram.h"
 #include "datagramIterator.h"
--- a/panda/src/express/ordered_vector.h
+++ b/panda/src/express/ordered_vector.h
@ -23,7 +23,7 @@

 #include "pvector.h"
 #include "pset.h"
-#include "notify.h"
+#include "pnotify.h"
 #include <algorithm>

 // There are some inheritance issues with template classes and typedef
--- a/panda/src/express/patchfile.h
+++ b/panda/src/express/patchfile.h
@ -23,7 +23,7 @@
 #ifdef HAVE_OPENSSL

 #include "typedef.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "filename.h"
 #include "plist.h"
 #include "datagram.h"
--- a/panda/src/express/pipelineCyclerLinks.h
+++ b/panda/src/express/pipelineCyclerLinks.h
@ -21,7 +21,7 @@

 #include "pandabase.h"
 #include "selectThreadImpl.h"  // for THREADED_PIPELINE definition
-#include "notify.h"
+#include "pnotify.h"

 ////////////////////////////////////////////////////////////////////
 //       Class : PipelineCyclerLinks
--- a/panda/src/express/pointerToVoid.h
+++ b/panda/src/express/pointerToVoid.h
@ -20,7 +20,7 @@
 #define POINTERTOVOID_H

 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"

 ////////////////////////////////////////////////////////////////////
 //       Class : PointerToVoid
--- a/panda/src/express/reversedNumericData.cxx
+++ b/panda/src/express/reversedNumericData.cxx
@ -17,7 +17,7 @@
 ////////////////////////////////////////////////////////////////////


-#include "notify.h"
+#include "pnotify.h"

 #include "reversedNumericData.h"

--- a/panda/src/express/test_types.cxx
+++ b/panda/src/express/test_types.cxx
@ -22,7 +22,7 @@
 #include "referenceCount.h"
 #include "dcast.h"

-#include "notify.h"
+#include "pnotify.h"

 class ThatThingie : public TypedObject, public ReferenceCount {
 public:
--- a/panda/src/express/thread.h
+++ b/panda/src/express/thread.h
@ -24,7 +24,7 @@
 #include "pointerTo.h"
 #include "threadPriority.h"
 #include "threadImpl.h"
-#include "notify.h"
+#include "pnotify.h"

 class Mutex;
 class ReMutex;
--- a/panda/src/express/threadDummyImpl.h
+++ b/panda/src/express/threadDummyImpl.h
@ -24,7 +24,7 @@

 #ifdef THREAD_DUMMY_IMPL

-#include "notify.h"
+#include "pnotify.h"
 #include "threadPriority.h"

 class Thread;
--- a/panda/src/express/threadNsprImpl.h
+++ b/panda/src/express/threadNsprImpl.h
@ -24,7 +24,7 @@

 #ifdef THREAD_NSPR_IMPL

-#include "notify.h"
+#include "pnotify.h"
 #include "threadPriority.h"
 #include "mutexNsprImpl.h"

--- a/panda/src/express/threadPosixImpl.h
+++ b/panda/src/express/threadPosixImpl.h
@ -24,7 +24,7 @@

 #ifdef THREAD_POSIX_IMPL

-#include "notify.h"
+#include "pnotify.h"
 #include "threadPriority.h"
 #include "mutexPosixImpl.h"

--- a/panda/src/express/threadWin32Impl.h
+++ b/panda/src/express/threadWin32Impl.h
@ -24,7 +24,7 @@

 #ifdef THREAD_WIN32_IMPL

-#include "notify.h"
+#include "pnotify.h"
 #include "threadPriority.h"
 #include "mutexWin32Impl.h"
 #include "conditionVarWin32Impl.h"
--- a/panda/src/helix/HelixClient.h
+++ b/panda/src/helix/HelixClient.h
@ -120,4 +120,4 @@ private:
  PLAYERS _players;
  TEXTURES _textures;
 }; 
-#endif
+#endif
--- a/panda/src/linmath/coordinateSystem.cxx
+++ b/panda/src/linmath/coordinateSystem.cxx
@ -22,7 +22,7 @@
 #include "string_utils.h"

 #include "dconfig.h"
-#include "notify.h"
+#include "pnotify.h"

 #include <ctype.h>

--- a/panda/src/linmath/lmatrix3.h
+++ b/panda/src/linmath/lmatrix3.h
@ -24,7 +24,7 @@
 #include "typedObject.h"
 #include "datagram.h"
 #include "datagramIterator.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "indent.h"
 #include "deg_2_rad.h"
 #include "nearly_zero.h"
--- a/panda/src/linmath/lorientation.h
+++ b/panda/src/linmath/lorientation.h
@ -20,7 +20,7 @@
 #define __LORIENTATION_H__

 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "lquaternion.h"

 #include "fltnames.h"
--- a/panda/src/linmath/lquaternion.h
+++ b/panda/src/linmath/lquaternion.h
@ -27,7 +27,7 @@
 #include "deg_2_rad.h"
 #include "compose_matrix.h"

-#include "notify.h"
+#include "pnotify.h"

 #include "fltnames.h"
 #include "lquaternion_src.h"
--- a/panda/src/linmath/lrotation.h
+++ b/panda/src/linmath/lrotation.h
@ -23,7 +23,7 @@
 #include "lquaternion.h"
 #include "cmath.h"

-#include "notify.h"
+#include "pnotify.h"

 #include "fltnames.h"
 #include "lrotation_src.h"
--- a/panda/src/linmath/lvecBase2.h
+++ b/panda/src/linmath/lvecBase2.h
@ -21,7 +21,7 @@

 #include "pandabase.h"
 #include "typedObject.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "datagram.h"
 #include "datagramIterator.h"
 #include "checksumHashGenerator.h"
--- a/panda/src/linmath/lvecBase3.h
+++ b/panda/src/linmath/lvecBase3.h
@ -21,7 +21,7 @@

 #include "pandabase.h"
 #include "typedObject.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "datagram.h"
 #include "datagramIterator.h"
 #include "checksumHashGenerator.h"
--- a/panda/src/linmath/lvecBase4.h
+++ b/panda/src/linmath/lvecBase4.h
@ -21,7 +21,7 @@

 #include "pandabase.h"
 #include "typedObject.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "datagram.h"
 #include "datagramIterator.h"
 #include "checksumHashGenerator.h"
--- a/panda/src/linmath/test_math.cxx
+++ b/panda/src/linmath/test_math.cxx
@ -20,7 +20,7 @@
 #include "lmatrix.h"
 #include "compose_matrix.h"

-#include "notify.h"
+#include "pnotify.h"
 #include <stdlib.h>

 void test() {
--- a/panda/src/mathutil/fftCompressor.cxx
+++ b/panda/src/mathutil/fftCompressor.cxx
@ -27,7 +27,11 @@

 #ifdef HAVE_FFTW

+#ifdef IS_OSX
+#include <drfftw.h>
+#else
 #include <rfftw.h>
+#endif 

 // These FFTW support objects can only be defined if we actually have
 // the FFTW library available.
--- a/panda/src/net/connection.cxx
+++ b/panda/src/net/connection.cxx
@ -25,7 +25,7 @@
 #include "config_net.h"
 #include "config_express.h" // for collect_tcp
 #include "clockObject.h"
-#include "notify.h"
+#include "pnotify.h"


 ////////////////////////////////////////////////////////////////////
--- a/panda/src/net/connectionReader.cxx
+++ b/panda/src/net/connectionReader.cxx
@ -25,7 +25,7 @@
 #include "config_net.h"
 #include "clockObject.h"

-#include "notify.h"
+#include "pnotify.h"
 #include <prerror.h>
 #include <pratom.h>
 #include <algorithm>
--- a/panda/src/net/connectionWriter.cxx
+++ b/panda/src/net/connectionWriter.cxx
@ -21,7 +21,7 @@
 #include "pprerror.h"
 #include "config_net.h"

-#include "notify.h"
+#include "pnotify.h"
 #include <prerror.h>

 ////////////////////////////////////////////////////////////////////
--- a/panda/src/net/datagramTCPHeader.cxx
+++ b/panda/src/net/datagramTCPHeader.cxx
@ -21,7 +21,7 @@
 #include "datagramIterator.h"
 #include "config_net.h"

-#include "notify.h"
+#include "pnotify.h"

 ////////////////////////////////////////////////////////////////////
 //     Function: DatagramTCPHeader::Constructor
--- a/panda/src/net/datagramUDPHeader.cxx
+++ b/panda/src/net/datagramUDPHeader.cxx
@ -21,7 +21,7 @@
 #include "datagramIterator.h"
 #include "config_net.h"

-#include "notify.h"
+#include "pnotify.h"

 ////////////////////////////////////////////////////////////////////
 //     Function: DatagramUDPHeader::Constructor
--- a/panda/src/pgraph/cullHandler.cxx
+++ b/panda/src/pgraph/cullHandler.cxx
@ -21,7 +21,7 @@
 #include "geom.h"
 #include "transformState.h"
 #include "renderState.h"
-#include "notify.h"
+#include "pnotify.h"

 ////////////////////////////////////////////////////////////////////
 //     Function: CullHandler::Destructor
--- a/panda/src/pgraph/loader.h
+++ b/panda/src/pgraph/loader.h
@ -22,7 +22,7 @@
 #include "pandabase.h"

 #include "loaderOptions.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "pandaNode.h"
 #include "filename.h"
 #include "tokenBoard.h"
--- a/panda/src/pgraph/nodePath.h
+++ b/panda/src/pgraph/nodePath.h
@ -29,7 +29,7 @@
 #include "nodePathComponent.h"
 #include "pointerTo.h"
 #include "referenceCount.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "typedObject.h"

 class NodePathCollection;
--- a/panda/src/pgraph/pandaNode.h
+++ b/panda/src/pgraph/pandaNode.h
@ -40,7 +40,7 @@
 #include "pointerTo.h"
 #include "nodePointerTo.h"
 #include "pointerToArray.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "updateSeq.h"

 #ifdef HAVE_PYTHON
--- a/panda/src/pgraph/polylightEffect.h
+++ b/panda/src/pgraph/polylightEffect.h
@ -27,7 +27,7 @@
 #include "nodePath.h"
 #include "polylightNode.h"
 #include "pmap.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "sceneSetup.h"


--- a/panda/src/pgraph/polylightNode.h
+++ b/panda/src/pgraph/polylightNode.h
@ -24,7 +24,7 @@
 #include "luse.h"
 #include "nodePath.h"
 #include "pmap.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "pandaNode.h"
 #include "colorAttrib.h"

--- a/panda/src/pstatclient/pStatFrameData.h
+++ b/panda/src/pstatclient/pStatFrameData.h
@ -21,7 +21,7 @@

 #include "pandabase.h"

-#include "notify.h"
+#include "pnotify.h"

 #include "pvector.h"

--- a/panda/src/putil/bamReader.cxx
+++ b/panda/src/putil/bamReader.cxx
@ -17,7 +17,7 @@
 ////////////////////////////////////////////////////////////////////

 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"

 #include "bam.h"
 #include "bamReader.h"
--- a/panda/src/putil/bamReader.h
+++ b/panda/src/putil/bamReader.h
@ -20,7 +20,7 @@
 #define __BAM_READER_

 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"

 #include "typedWritable.h"
 #include "datagramGenerator.h"
--- a/panda/src/putil/bamWriter.cxx
+++ b/panda/src/putil/bamWriter.cxx
@ -17,7 +17,7 @@
 ////////////////////////////////////////////////////////////////////

 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"

 #include "typedWritable.h"
 #include "config_util.h"
--- a/panda/src/putil/bamWriter.h
+++ b/panda/src/putil/bamWriter.h
@ -20,7 +20,7 @@
 #define __BAM_WRITER_

 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "bamEndian.h"
 #include "bamTextureMode.h"
 #include "typedWritable.h"
--- a/panda/src/putil/buttonRegistry.I
+++ b/panda/src/putil/buttonRegistry.I
@ -16,7 +16,7 @@
 //
 ////////////////////////////////////////////////////////////////////

-#include "notify.h"
+#include "pnotify.h"

 ////////////////////////////////////////////////////////////////////
 //     Function: ButtonRegistry::RegistryNode::Constructor
--- a/panda/src/putil/factoryParams.I
+++ b/panda/src/putil/factoryParams.I
@ -16,7 +16,7 @@
 //
 ////////////////////////////////////////////////////////////////////

-#include "notify.h"
+#include "pnotify.h"


 ////////////////////////////////////////////////////////////////////
--- a/panda/src/putil/modifierButtons.cxx
+++ b/panda/src/putil/modifierButtons.cxx
@ -18,7 +18,7 @@

 #include "modifierButtons.h"

-#include "notify.h"
+#include "pnotify.h"

 ////////////////////////////////////////////////////////////////////
 //     Function: ModifierButtons::Constructor
--- a/panda/src/putil/mouseButton.cxx
+++ b/panda/src/putil/mouseButton.cxx
@ -18,7 +18,7 @@

 #include "mouseButton.h"
 #include "buttonRegistry.h"
-#include "notify.h"
+#include "pnotify.h"

 #include <stdio.h>

--- a/panda/src/putil/nameUniquifier.cxx
+++ b/panda/src/putil/nameUniquifier.cxx
@ -18,7 +18,7 @@

 #include "nameUniquifier.h"

-#include "notify.h"
+#include "pnotify.h"

 #include <stdio.h>

--- a/panda/src/putil/test_bam.cxx
+++ b/panda/src/putil/test_bam.cxx
@ -17,7 +17,7 @@
 ////////////////////////////////////////////////////////////////////

 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "dconfig.h"

 #include "test_bam.h"
--- a/panda/src/putil/test_bam.h
+++ b/panda/src/putil/test_bam.h
@ -18,7 +18,7 @@


 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"

 #include "factory.h"
 #include "writableParam.h"
--- a/panda/src/putil/test_bamRead.cxx
+++ b/panda/src/putil/test_bamRead.cxx
@ -17,7 +17,7 @@
 ////////////////////////////////////////////////////////////////////

 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"

 #include <ipc_file.h>
 #include "test_bam.h"
--- a/panda/src/putil/test_bamWrite.cxx
+++ b/panda/src/putil/test_bamWrite.cxx
@ -17,7 +17,7 @@
 ////////////////////////////////////////////////////////////////////

 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"

 #include "test_bam.h"

--- a/panda/src/putil/test_linestream.cxx
+++ b/panda/src/putil/test_linestream.cxx
@ -18,7 +18,7 @@

 #include "lineStream.h"

-#include "notify.h"
+#include "pnotify.h"

 int
 main(int argc, char *argv[]) {
--- a/panda/src/putil/uniqueIdAllocator.cxx
+++ b/panda/src/putil/uniqueIdAllocator.cxx
@ -18,7 +18,7 @@
 // 

 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"

 #include "uniqueIdAllocator.h"

--- a/panda/src/testbed/text_test.cxx
+++ b/panda/src/testbed/text_test.cxx
@ -20,7 +20,7 @@
 #include "chancfg.h"
 #include "textNode.h"
 #include "eggLoader.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "pt_NamedNode.h"

 extern PT_NamedNode render;
--- a/panda/src/text/textNode.cxx
+++ b/panda/src/text/textNode.cxx
@ -29,7 +29,7 @@
 #include "geomTristrips.h"
 #include "geomVertexWriter.h"
 #include "geomNode.h"
-#include "notify.h"
+#include "pnotify.h"
 #include "transformState.h"
 #include "colorAttrib.h"
 #include "colorScaleAttrib.h"