OSX Commit

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"

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"

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"

panda/src/display/windowProperties.h

@@ -21,7 +21,7 @@
 
 #include "pandabase.h"
 #include "filename.h"
-#include "notify.h"
+#include "pnotify.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : WindowProperties

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

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"

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>
 

panda/src/downloader/urlSpec.h

@@ -20,7 +20,7 @@
 #define URLSPEC_H
 
 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : URLSpec

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"

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"

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"

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"

panda/src/egg/eggAnimData.I

@@ -16,7 +16,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include "notify.h"
+#include "pnotify.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: EggAnimData::Constructor

panda/src/egg/eggAttributes.h

@@ -25,7 +25,7 @@
 
 #include "typedObject.h"
 #include "luse.h"
-#include "notify.h"
+#include "pnotify.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : EggAttributes

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;
 

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"

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;
 

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"
 
 ////////////////////////////////////////////////////////////////////

panda/src/egg/eggGroupUniquifier.cxx

@@ -19,7 +19,7 @@
 #include "eggGroupUniquifier.h"
 #include "eggGroup.h"
 
-#include "notify.h"
+#include "pnotify.h"
 
 #include <ctype.h>
 

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;

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;
 

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;
 

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;
 

panda/src/egg/test_egg.cxx

@@ -17,7 +17,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "eggData.h"
-#include "notify.h"
+#include "pnotify.h"
 
 
 int

panda/src/express/atomicAdjustDummyImpl.h

@@ -24,7 +24,7 @@
 
 #ifdef THREAD_DUMMY_IMPL
 
-#include "notify.h"
+#include "pnotify.h"
 #include "numeric_types.h"
 
 ////////////////////////////////////////////////////////////////////

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>

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>

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>

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

panda/src/express/conditionVarDummyImpl.h

@@ -24,7 +24,7 @@
 
 #ifdef THREAD_DUMMY_IMPL
 
-#include "notify.h"
+#include "pnotify.h"
 
 class MutexDummyImpl;
 

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>
 

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>
 

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>
 

panda/src/express/datagram.cxx

@@ -19,7 +19,7 @@
 
 #include "datagram.h"
 
-#include "notify.h"
+#include "pnotify.h"
 
 // for sprintf().
 #include <stdio.h>

panda/src/express/datagramIterator.cxx

@@ -18,7 +18,7 @@
 
 
 #include "datagramIterator.h"
-#include "notify.h"
+#include "pnotify.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: DatagramIterator::get_string

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"

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"

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

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"

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

panda/src/express/pointerToVoid.h

@@ -20,7 +20,7 @@
 #define POINTERTOVOID_H
 
 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PointerToVoid

panda/src/express/reversedNumericData.cxx

@@ -17,7 +17,7 @@
 ////////////////////////////////////////////////////////////////////
 
 
-#include "notify.h"
+#include "pnotify.h"
 
 #include "reversedNumericData.h"
 

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:

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;

panda/src/express/threadDummyImpl.h

@@ -24,7 +24,7 @@
 
 #ifdef THREAD_DUMMY_IMPL
 
-#include "notify.h"
+#include "pnotify.h"
 #include "threadPriority.h"
 
 class Thread;

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"
 

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"
 

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"

panda/src/helix/HelixClient.h

@@ -120,4 +120,4 @@ private:
   PLAYERS _players;
   TEXTURES _textures;
 }; 
-#endif
+#endif

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>
 

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"

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"

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"

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"

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"

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"

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"

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() {

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.

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"
 
 
 ////////////////////////////////////////////////////////////////////

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>

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>
 
 ////////////////////////////////////////////////////////////////////

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

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

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

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"

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;

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

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"
 
 

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"
 

panda/src/pstatclient/pStatFrameData.h

@@ -21,7 +21,7 @@
 
 #include "pandabase.h"
 
-#include "notify.h"
+#include "pnotify.h"
 
 #include "pvector.h"
 

panda/src/putil/bamReader.cxx

@@ -17,7 +17,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"
 
 #include "bam.h"
 #include "bamReader.h"

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"

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"

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"

panda/src/putil/buttonRegistry.I

@@ -16,7 +16,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include "notify.h"
+#include "pnotify.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: ButtonRegistry::RegistryNode::Constructor

panda/src/putil/factoryParams.I

@@ -16,7 +16,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include "notify.h"
+#include "pnotify.h"
 
 
 ////////////////////////////////////////////////////////////////////

panda/src/putil/modifierButtons.cxx

@@ -18,7 +18,7 @@
 
 #include "modifierButtons.h"
 
-#include "notify.h"
+#include "pnotify.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: ModifierButtons::Constructor

panda/src/putil/mouseButton.cxx

@@ -18,7 +18,7 @@
 
 #include "mouseButton.h"
 #include "buttonRegistry.h"
-#include "notify.h"
+#include "pnotify.h"
 
 #include <stdio.h>
 

panda/src/putil/nameUniquifier.cxx

@@ -18,7 +18,7 @@
 
 #include "nameUniquifier.h"
 
-#include "notify.h"
+#include "pnotify.h"
 
 #include <stdio.h>
 

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"

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"

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"

panda/src/putil/test_bamWrite.cxx

@@ -17,7 +17,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"
 
 #include "test_bam.h"
 

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[]) {

panda/src/putil/uniqueIdAllocator.cxx

@@ -18,7 +18,7 @@
 // 
 
 #include "pandabase.h"
-#include "notify.h"
+#include "pnotify.h"
 
 #include "uniqueIdAllocator.h"
 

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;

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"