mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 10:54:24 -04:00
undef after temporary redef
This commit is contained in:
parent
a68c6cc412
commit
70d5e7c549
@ -21,23 +21,27 @@
|
|||||||
|
|
||||||
#ifdef int8
|
#ifdef int8
|
||||||
#define temp_ode_int8 int8
|
#define temp_ode_int8 int8
|
||||||
|
#undef int8
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef int32
|
#ifdef int32
|
||||||
#define temp_ode_int32 int32
|
#define temp_ode_int32 int32
|
||||||
|
#undef int32
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef uint32
|
#ifdef uint32
|
||||||
#define temp_ode_uint32 uint32
|
#define temp_ode_uint32 uint32
|
||||||
|
#undef uint32
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#define int8 ode_int8
|
#define int8 ode_int8
|
||||||
#define int32 ode_int32
|
#define int32 ode_int32
|
||||||
#define uint32 ode_uint32
|
#define uint32 ode_uint32
|
||||||
|
|
||||||
#include "ode/ode.h"
|
#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 int8
|
||||||
#undef int32
|
#undef int32
|
||||||
#undef uint32
|
#undef uint32
|
||||||
|
Loading…
x
Reference in New Issue
Block a user