From 70d5e7c549125eff007ff39bab62a6b702b76f1f Mon Sep 17 00:00:00 2001 From: Josh Wilson Date: Mon, 12 Feb 2007 20:58:32 +0000 Subject: [PATCH] undef after temporary redef --- panda/src/ode/ode_includes.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/panda/src/ode/ode_includes.h b/panda/src/ode/ode_includes.h index dadd43d1a5..9692c2445f 100755 --- a/panda/src/ode/ode_includes.h +++ b/panda/src/ode/ode_includes.h @@ -21,23 +21,27 @@ #ifdef int8 #define temp_ode_int8 int8 + #undef int8 #endif #ifdef int32 #define temp_ode_int32 int32 + #undef int32 #endif #ifdef uint32 #define temp_ode_uint32 uint32 + #undef uint32 #endif - #define int8 ode_int8 #define int32 ode_int32 #define uint32 ode_uint32 #include "ode/ode.h" +// These are the ones that conflict with other defines in Panda. +// It may be necessary to add to this list at a later time. #undef int8 #undef int32 #undef uint32