From 3fac39f0325b26d100dc5be4267c1cb0316ebfa6 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 19 May 2004 05:32:26 +0000 Subject: [PATCH] fix compiling issues w/o python --- direct/src/dcparser/dcClass.cxx | 4 ++++ direct/src/dcparser/dcClass.h | 2 ++ direct/src/dcparser/dcbase.h | 2 ++ 3 files changed, 8 insertions(+) diff --git a/direct/src/dcparser/dcClass.cxx b/direct/src/dcparser/dcClass.cxx index 19cc83867c..b85e62a42d 100644 --- a/direct/src/dcparser/dcClass.cxx +++ b/direct/src/dcparser/dcClass.cxx @@ -475,7 +475,9 @@ ai_format_generate(PyObject *distobj, int do_id, //////////////////////////////////////////////////////////////////// DCClass:: DCClass(const string &name) : _name(name) { +#ifdef HAVE_PYTHON _class_def = NULL; +#endif } //////////////////////////////////////////////////////////////////// @@ -490,7 +492,9 @@ DCClass:: delete (*fi); } +#ifdef HAVE_PYTHON Py_XDECREF(_class_def); +#endif } //////////////////////////////////////////////////////////////////// diff --git a/direct/src/dcparser/dcClass.h b/direct/src/dcparser/dcClass.h index ee4b19d5ab..37eae66932 100644 --- a/direct/src/dcparser/dcClass.h +++ b/direct/src/dcparser/dcClass.h @@ -90,7 +90,9 @@ private: typedef pvector Fields; Fields _fields; +#ifdef HAVE_PYTHON PyObject *_class_def; +#endif public: // These members are built up during parsing for the convenience of diff --git a/direct/src/dcparser/dcbase.h b/direct/src/dcparser/dcbase.h index 7e84111f33..6981d63b90 100644 --- a/direct/src/dcparser/dcbase.h +++ b/direct/src/dcparser/dcbase.h @@ -75,7 +75,9 @@ using namespace std; // Panda defines some assert-type macros. We map those to the // standard assert macro outside of Panda. #define nassertr(condition, return_value) assert(condition) +#define nassertr_always(condition, return_value) assert(condition) #define nassertv(condition) assert(condition) +#define nassertv_always(condition) assert(condition) // Panda defines these export symbols for building DLL's. Outside of // Panda, we assume we're not putting this code in a DLL, so we define