From 477fdc8775307ae1323f41d906489da391633691 Mon Sep 17 00:00:00 2001 From: Roger Hughston Date: Fri, 17 Mar 2006 22:57:38 +0000 Subject: [PATCH] OSX Commit --- panda/src/display/graphicsOutput.h | 2 +- panda/src/display/graphicsStateGuardian.h | 2 +- panda/src/display/graphicsWindow.h | 2 +- panda/src/display/windowProperties.h | 2 +- panda/src/downloader/asyncUtility.h | 2 +- panda/src/downloader/downloadDb.h | 2 +- panda/src/downloader/multiplexStreamBuf.cxx | 2 +- panda/src/downloader/urlSpec.h | 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/egg/eggAnimData.I | 2 +- panda/src/egg/eggAttributes.h | 2 +- panda/src/egg/eggBinMaker.cxx | 2 +- panda/src/egg/eggBinMaker.h | 2 +- panda/src/egg/eggCurve.cxx | 2 +- panda/src/egg/eggData.h | 2 +- panda/src/egg/eggGroupUniquifier.cxx | 2 +- panda/src/egg/eggMesherFanMaker.h | 2 +- panda/src/egg/eggNameUniquifier.cxx | 2 +- panda/src/egg/eggPoolUniquifier.cxx | 2 +- panda/src/egg/eggRenderMode.cxx | 2 +- panda/src/egg/test_egg.cxx | 2 +- panda/src/express/atomicAdjustDummyImpl.h | 2 +- panda/src/express/atomicAdjustNsprImpl.h | 2 +- panda/src/express/atomicAdjustPosixImpl.h | 2 +- panda/src/express/atomicAdjustWin32Impl.h | 2 +- panda/src/express/circBuffer.I | 2 +- panda/src/express/conditionVarDummyImpl.h | 2 +- panda/src/express/conditionVarNsprImpl.h | 2 +- panda/src/express/conditionVarPosixImpl.h | 2 +- panda/src/express/conditionVarWin32Impl.h | 2 +- panda/src/express/datagram.cxx | 2 +- panda/src/express/datagramIterator.cxx | 2 +- panda/src/express/express_headers.h | 2 +- panda/src/express/hashVal.h | 2 +- panda/src/express/ordered_vector.h | 2 +- panda/src/express/patchfile.h | 2 +- panda/src/express/pipelineCyclerLinks.h | 2 +- panda/src/express/pointerToVoid.h | 2 +- panda/src/express/reversedNumericData.cxx | 2 +- panda/src/express/test_types.cxx | 2 +- panda/src/express/thread.h | 2 +- panda/src/express/threadDummyImpl.h | 2 +- panda/src/express/threadNsprImpl.h | 2 +- panda/src/express/threadPosixImpl.h | 2 +- panda/src/express/threadWin32Impl.h | 2 +- panda/src/helix/HelixClient.h | 2 +- panda/src/linmath/coordinateSystem.cxx | 2 +- panda/src/linmath/lmatrix3.h | 2 +- panda/src/linmath/lorientation.h | 2 +- panda/src/linmath/lquaternion.h | 2 +- panda/src/linmath/lrotation.h | 2 +- panda/src/linmath/lvecBase2.h | 2 +- panda/src/linmath/lvecBase3.h | 2 +- panda/src/linmath/lvecBase4.h | 2 +- panda/src/linmath/test_math.cxx | 2 +- panda/src/mathutil/fftCompressor.cxx | 4 ++++ panda/src/net/connection.cxx | 2 +- panda/src/net/connectionReader.cxx | 2 +- panda/src/net/connectionWriter.cxx | 2 +- panda/src/net/datagramTCPHeader.cxx | 2 +- panda/src/net/datagramUDPHeader.cxx | 2 +- panda/src/pgraph/cullHandler.cxx | 2 +- panda/src/pgraph/loader.h | 2 +- panda/src/pgraph/nodePath.h | 2 +- panda/src/pgraph/pandaNode.h | 2 +- panda/src/pgraph/polylightEffect.h | 2 +- panda/src/pgraph/polylightNode.h | 2 +- panda/src/pstatclient/pStatFrameData.h | 2 +- panda/src/putil/bamReader.cxx | 2 +- panda/src/putil/bamReader.h | 2 +- panda/src/putil/bamWriter.cxx | 2 +- panda/src/putil/bamWriter.h | 2 +- panda/src/putil/buttonRegistry.I | 2 +- panda/src/putil/factoryParams.I | 2 +- panda/src/putil/modifierButtons.cxx | 2 +- panda/src/putil/mouseButton.cxx | 2 +- panda/src/putil/nameUniquifier.cxx | 2 +- panda/src/putil/test_bam.cxx | 2 +- panda/src/putil/test_bam.h | 2 +- panda/src/putil/test_bamRead.cxx | 2 +- panda/src/putil/test_bamWrite.cxx | 2 +- panda/src/putil/test_linestream.cxx | 2 +- panda/src/putil/uniqueIdAllocator.cxx | 2 +- panda/src/testbed/text_test.cxx | 2 +- panda/src/text/textNode.cxx | 2 +- 88 files changed, 91 insertions(+), 87 deletions(-) diff --git a/panda/src/display/graphicsOutput.h b/panda/src/display/graphicsOutput.h index 0d62759974..6a480515bb 100644 --- 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" diff --git a/panda/src/display/graphicsStateGuardian.h b/panda/src/display/graphicsStateGuardian.h index 7f1be8e15c..062d4ffb36 100644 --- 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" diff --git a/panda/src/display/graphicsWindow.h b/panda/src/display/graphicsWindow.h index 466e273814..9bbd1f3b22 100644 --- 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" diff --git a/panda/src/display/windowProperties.h b/panda/src/display/windowProperties.h index 8f53c78a6e..ff27dede75 100644 --- 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 diff --git a/panda/src/downloader/asyncUtility.h b/panda/src/downloader/asyncUtility.h index 1bda0be9ff..d73bf2fc65 100644 --- 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 diff --git a/panda/src/downloader/downloadDb.h b/panda/src/downloader/downloadDb.h index ca8a3aded7..2cfe06b062 100644 --- 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" diff --git a/panda/src/downloader/multiplexStreamBuf.cxx b/panda/src/downloader/multiplexStreamBuf.cxx index 1b891325ae..ddcd7f0eb0 100644 --- 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 diff --git a/panda/src/downloader/urlSpec.h b/panda/src/downloader/urlSpec.h index 41c767cbe5..f59b5e4cb8 100644 --- 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 diff --git a/panda/src/downloadertools/pdecrypt.cxx b/panda/src/downloadertools/pdecrypt.cxx index 373a64f9a1..a10718f5f9 100644 --- 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" diff --git a/panda/src/downloadertools/pencrypt.cxx b/panda/src/downloadertools/pencrypt.cxx index cd64984159..07a8ba9d29 100644 --- 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" diff --git a/panda/src/downloadertools/punzip.cxx b/panda/src/downloadertools/punzip.cxx index fc12f8d042..68bb6e9820 100644 --- 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" diff --git a/panda/src/downloadertools/pzip.cxx b/panda/src/downloadertools/pzip.cxx index 3805a81b30..3e3659eafb 100644 --- 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" diff --git a/panda/src/egg/eggAnimData.I b/panda/src/egg/eggAnimData.I index 35aa63c802..af1887ebc7 100644 --- 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 diff --git a/panda/src/egg/eggAttributes.h b/panda/src/egg/eggAttributes.h index 6a31bf8c76..edde1797f2 100644 --- 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 diff --git a/panda/src/egg/eggBinMaker.cxx b/panda/src/egg/eggBinMaker.cxx index f969a294fc..c5a42849b4 100644 --- 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; diff --git a/panda/src/egg/eggBinMaker.h b/panda/src/egg/eggBinMaker.h index ac7dfb7a36..43ff1a9db0 100644 --- 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" diff --git a/panda/src/egg/eggCurve.cxx b/panda/src/egg/eggCurve.cxx index 6ccb3086e3..4032ca19dd 100644 --- 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; diff --git a/panda/src/egg/eggData.h b/panda/src/egg/eggData.h index b84481cb25..47f3a58261 100644 --- 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" //////////////////////////////////////////////////////////////////// diff --git a/panda/src/egg/eggGroupUniquifier.cxx b/panda/src/egg/eggGroupUniquifier.cxx index fa84063164..24670ce85c 100644 --- 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 diff --git a/panda/src/egg/eggMesherFanMaker.h b/panda/src/egg/eggMesherFanMaker.h index 95ef6e46b9..0b796b09ec 100644 --- 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; diff --git a/panda/src/egg/eggNameUniquifier.cxx b/panda/src/egg/eggNameUniquifier.cxx index dbeb91559c..7a2984150b 100644 --- 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; diff --git a/panda/src/egg/eggPoolUniquifier.cxx b/panda/src/egg/eggPoolUniquifier.cxx index 638d8c4921..4c39c5ab98 100644 --- 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; diff --git a/panda/src/egg/eggRenderMode.cxx b/panda/src/egg/eggRenderMode.cxx index 63361ac41b..08d9ea82c5 100644 --- 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; diff --git a/panda/src/egg/test_egg.cxx b/panda/src/egg/test_egg.cxx index a44f9b01e4..96d70e90d5 100644 --- 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 diff --git a/panda/src/express/atomicAdjustDummyImpl.h b/panda/src/express/atomicAdjustDummyImpl.h index 1046ee4dd4..74ef86eaa4 100644 --- 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" //////////////////////////////////////////////////////////////////// diff --git a/panda/src/express/atomicAdjustNsprImpl.h b/panda/src/express/atomicAdjustNsprImpl.h index 05acfcbe00..2df1afe8ff 100644 --- 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 diff --git a/panda/src/express/atomicAdjustPosixImpl.h b/panda/src/express/atomicAdjustPosixImpl.h index 5e6c10b606..4fe882a22d 100644 --- 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 diff --git a/panda/src/express/atomicAdjustWin32Impl.h b/panda/src/express/atomicAdjustWin32Impl.h index f267642c70..9bbd1625b2 100644 --- 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 diff --git a/panda/src/express/circBuffer.I b/panda/src/express/circBuffer.I index f85b95722c..f5ef4f71c6 100644 --- 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 diff --git a/panda/src/express/conditionVarDummyImpl.h b/panda/src/express/conditionVarDummyImpl.h index 513e75b1ce..5a2d9bdb41 100644 --- 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; diff --git a/panda/src/express/conditionVarNsprImpl.h b/panda/src/express/conditionVarNsprImpl.h index 3702ea12a2..5dedb2eb7d 100644 --- 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 diff --git a/panda/src/express/conditionVarPosixImpl.h b/panda/src/express/conditionVarPosixImpl.h index 30487dfc8d..ccd916a4d5 100644 --- 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 diff --git a/panda/src/express/conditionVarWin32Impl.h b/panda/src/express/conditionVarWin32Impl.h index c88073b29d..94974352fc 100644 --- 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 diff --git a/panda/src/express/datagram.cxx b/panda/src/express/datagram.cxx index 3cee779ca5..a8f6671f2e 100644 --- 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 diff --git a/panda/src/express/datagramIterator.cxx b/panda/src/express/datagramIterator.cxx index ab1fe3e7e8..341973267b 100644 --- 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 diff --git a/panda/src/express/express_headers.h b/panda/src/express/express_headers.h index 6fdbef1332..23a9564fa6 100644 --- a/panda/src/express/express_headers.h +++ b/panda/src/express/express_headers.h @@ -19,7 +19,7 @@ #include "pandabase.h" #include #include -#include "notify.h" +#include "pnotify.h" #include "clockObject.h" #include "config_express.h" diff --git a/panda/src/express/hashVal.h b/panda/src/express/hashVal.h index 67210be9ad..60d93e785e 100644 --- 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" diff --git a/panda/src/express/ordered_vector.h b/panda/src/express/ordered_vector.h index 03b075b775..6f7166822d 100644 --- 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 // There are some inheritance issues with template classes and typedef diff --git a/panda/src/express/patchfile.h b/panda/src/express/patchfile.h index 2b2116418e..bfda24cbc8 100644 --- 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" diff --git a/panda/src/express/pipelineCyclerLinks.h b/panda/src/express/pipelineCyclerLinks.h index b26b20a2c5..be2021ba63 100644 --- 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 diff --git a/panda/src/express/pointerToVoid.h b/panda/src/express/pointerToVoid.h index 907feceed4..51f043aa3a 100644 --- 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 diff --git a/panda/src/express/reversedNumericData.cxx b/panda/src/express/reversedNumericData.cxx index d177484bb1..2b08424f45 100644 --- 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" diff --git a/panda/src/express/test_types.cxx b/panda/src/express/test_types.cxx index 9738a24cc4..fd187b695d 100644 --- 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: diff --git a/panda/src/express/thread.h b/panda/src/express/thread.h index cbd35a4af8..8c02ce57a2 100644 --- 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; diff --git a/panda/src/express/threadDummyImpl.h b/panda/src/express/threadDummyImpl.h index 51b7379852..31ee8fe351 100644 --- 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; diff --git a/panda/src/express/threadNsprImpl.h b/panda/src/express/threadNsprImpl.h index d86d41a17f..9bc2c31b7f 100644 --- 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" diff --git a/panda/src/express/threadPosixImpl.h b/panda/src/express/threadPosixImpl.h index 68f9eb8db1..2759a176ec 100644 --- 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" diff --git a/panda/src/express/threadWin32Impl.h b/panda/src/express/threadWin32Impl.h index fdc63b12d8..2823a21a98 100644 --- 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" diff --git a/panda/src/helix/HelixClient.h b/panda/src/helix/HelixClient.h index 8fd474c2fc..bf6187cdc2 100644 --- a/panda/src/helix/HelixClient.h +++ b/panda/src/helix/HelixClient.h @@ -120,4 +120,4 @@ private: PLAYERS _players; TEXTURES _textures; }; -#endif \ No newline at end of file +#endif diff --git a/panda/src/linmath/coordinateSystem.cxx b/panda/src/linmath/coordinateSystem.cxx index 207d84c729..50cdbd7786 100644 --- 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 diff --git a/panda/src/linmath/lmatrix3.h b/panda/src/linmath/lmatrix3.h index 146529dd3d..8cf76d3597 100644 --- 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" diff --git a/panda/src/linmath/lorientation.h b/panda/src/linmath/lorientation.h index ff093716e2..485c0271cc 100644 --- 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" diff --git a/panda/src/linmath/lquaternion.h b/panda/src/linmath/lquaternion.h index 3071a1c83e..a35089f741 100644 --- 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" diff --git a/panda/src/linmath/lrotation.h b/panda/src/linmath/lrotation.h index 6b4fd4ca68..d2a1a66a0e 100644 --- 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" diff --git a/panda/src/linmath/lvecBase2.h b/panda/src/linmath/lvecBase2.h index 55f4b7fa5a..d58a5364ae 100644 --- 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" diff --git a/panda/src/linmath/lvecBase3.h b/panda/src/linmath/lvecBase3.h index 076fd25ab8..40e697c376 100644 --- 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" diff --git a/panda/src/linmath/lvecBase4.h b/panda/src/linmath/lvecBase4.h index 3af4663ab5..c79ae550f1 100644 --- 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" diff --git a/panda/src/linmath/test_math.cxx b/panda/src/linmath/test_math.cxx index 5c4b661be2..fbb9f3a576 100644 --- 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 void test() { diff --git a/panda/src/mathutil/fftCompressor.cxx b/panda/src/mathutil/fftCompressor.cxx index 663a6b699f..7023fb6ea9 100644 --- a/panda/src/mathutil/fftCompressor.cxx +++ b/panda/src/mathutil/fftCompressor.cxx @@ -27,7 +27,11 @@ #ifdef HAVE_FFTW +#ifdef IS_OSX +#include +#else #include +#endif // These FFTW support objects can only be defined if we actually have // the FFTW library available. diff --git a/panda/src/net/connection.cxx b/panda/src/net/connection.cxx index 39dca45021..00f857dfea 100644 --- 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" //////////////////////////////////////////////////////////////////// diff --git a/panda/src/net/connectionReader.cxx b/panda/src/net/connectionReader.cxx index 68a0645032..de6eac2dc6 100644 --- 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 #include #include diff --git a/panda/src/net/connectionWriter.cxx b/panda/src/net/connectionWriter.cxx index 855e5f57fc..5161ca0052 100644 --- 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 //////////////////////////////////////////////////////////////////// diff --git a/panda/src/net/datagramTCPHeader.cxx b/panda/src/net/datagramTCPHeader.cxx index 31681bb52d..dfb79c4a43 100644 --- 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 diff --git a/panda/src/net/datagramUDPHeader.cxx b/panda/src/net/datagramUDPHeader.cxx index 8a227a9cb9..1a9697de08 100644 --- 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 diff --git a/panda/src/pgraph/cullHandler.cxx b/panda/src/pgraph/cullHandler.cxx index 6301070503..05e464c2bd 100644 --- 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 diff --git a/panda/src/pgraph/loader.h b/panda/src/pgraph/loader.h index 52a71adbf2..c0df489150 100644 --- 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" diff --git a/panda/src/pgraph/nodePath.h b/panda/src/pgraph/nodePath.h index e38537e220..359172c857 100644 --- 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; diff --git a/panda/src/pgraph/pandaNode.h b/panda/src/pgraph/pandaNode.h index e3cd4354ae..7d149cdd7e 100644 --- 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 diff --git a/panda/src/pgraph/polylightEffect.h b/panda/src/pgraph/polylightEffect.h index d22407f7c6..986f0820af 100755 --- 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" diff --git a/panda/src/pgraph/polylightNode.h b/panda/src/pgraph/polylightNode.h index 6e90b915fe..5e7c496ddc 100755 --- 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" diff --git a/panda/src/pstatclient/pStatFrameData.h b/panda/src/pstatclient/pStatFrameData.h index 85f7003821..aa6dfca66a 100644 --- 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" diff --git a/panda/src/putil/bamReader.cxx b/panda/src/putil/bamReader.cxx index 06234f58cc..f674ab665d 100644 --- 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" diff --git a/panda/src/putil/bamReader.h b/panda/src/putil/bamReader.h index 06a2eb0508..6802bcac3b 100644 --- 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" diff --git a/panda/src/putil/bamWriter.cxx b/panda/src/putil/bamWriter.cxx index 436b4395da..7fbed5a125 100644 --- 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" diff --git a/panda/src/putil/bamWriter.h b/panda/src/putil/bamWriter.h index 7683833461..f068649717 100644 --- 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" diff --git a/panda/src/putil/buttonRegistry.I b/panda/src/putil/buttonRegistry.I index b91d7ce71b..7a195364f1 100644 --- 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 diff --git a/panda/src/putil/factoryParams.I b/panda/src/putil/factoryParams.I index 114c585b58..c5b8d1b126 100644 --- a/panda/src/putil/factoryParams.I +++ b/panda/src/putil/factoryParams.I @@ -16,7 +16,7 @@ // //////////////////////////////////////////////////////////////////// -#include "notify.h" +#include "pnotify.h" //////////////////////////////////////////////////////////////////// diff --git a/panda/src/putil/modifierButtons.cxx b/panda/src/putil/modifierButtons.cxx index d3dd37adc7..615190f88a 100644 --- 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 diff --git a/panda/src/putil/mouseButton.cxx b/panda/src/putil/mouseButton.cxx index 24665ba07f..102e86b412 100644 --- 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 diff --git a/panda/src/putil/nameUniquifier.cxx b/panda/src/putil/nameUniquifier.cxx index 68fc54c9e4..077c68c649 100644 --- 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 diff --git a/panda/src/putil/test_bam.cxx b/panda/src/putil/test_bam.cxx index ccb2bc4940..7d0daae7dd 100644 --- 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" diff --git a/panda/src/putil/test_bam.h b/panda/src/putil/test_bam.h index fd9fdea7ac..c7432cece4 100644 --- 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" diff --git a/panda/src/putil/test_bamRead.cxx b/panda/src/putil/test_bamRead.cxx index 1f3b0de847..cd3d78e806 100644 --- 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 #include "test_bam.h" diff --git a/panda/src/putil/test_bamWrite.cxx b/panda/src/putil/test_bamWrite.cxx index f69800b866..4318909f28 100644 --- 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" diff --git a/panda/src/putil/test_linestream.cxx b/panda/src/putil/test_linestream.cxx index 3d388e8646..974c10e216 100644 --- 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[]) { diff --git a/panda/src/putil/uniqueIdAllocator.cxx b/panda/src/putil/uniqueIdAllocator.cxx index ed2c995b1b..3b210f47c0 100644 --- 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" diff --git a/panda/src/testbed/text_test.cxx b/panda/src/testbed/text_test.cxx index 7b2a49036d..a735e61a4a 100644 --- 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; diff --git a/panda/src/text/textNode.cxx b/panda/src/text/textNode.cxx index 56dd45d23b..b9aa3435ce 100644 --- 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"