From ee9ea70f771c0f878a290a5b2011eef57ffc2010 Mon Sep 17 00:00:00 2001 From: Josh Wilson Date: Mon, 29 Jan 2007 23:04:00 +0000 Subject: [PATCH] need config.h to prevent integer typedef collisions --- dtool/src/parser-inc/Sources.pp | 2 +- dtool/src/parser-inc/common.h | 9 ++++++++- dtool/src/parser-inc/config.h | 20 ++++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100755 dtool/src/parser-inc/config.h diff --git a/dtool/src/parser-inc/Sources.pp b/dtool/src/parser-inc/Sources.pp index 6046032534..90c3fe243d 100644 --- a/dtool/src/parser-inc/Sources.pp +++ b/dtool/src/parser-inc/Sources.pp @@ -11,4 +11,4 @@ avcodec.h avformat.h avio.h avutil.h common.h integer.h \ intfloat_readwrite.h mathematics.h rational.h rtp.h \ rtsp.h rtspcodes.h winsock2.h \ - ode/common.h + ode/common.h ode/config.h diff --git a/dtool/src/parser-inc/common.h b/dtool/src/parser-inc/common.h index 43e9b8946c..00b0cf0bc4 100644 --- a/dtool/src/parser-inc/common.h +++ b/dtool/src/parser-inc/common.h @@ -6,8 +6,15 @@ #ifndef COMMON_H #define COMMON_H +#endif /* COMMON_H */ + + + # ODE header stuff +#ifndef _ODE_COMMON_H_ +#define _ODE_COMMON_H_ + #if defined(dSINGLE) typedef float dReal; #elif defined(dDOUBLE) @@ -45,4 +52,4 @@ typedef struct dJointFeedback { dVector3 t2; /* torque applied to body 2 */ } dJointFeedback; -#endif /* COMMON_H */ +#endif /* _ODE_COMMON_H_ */ diff --git a/dtool/src/parser-inc/config.h b/dtool/src/parser-inc/config.h new file mode 100755 index 0000000000..2c45e28f12 --- /dev/null +++ b/dtool/src/parser-inc/config.h @@ -0,0 +1,20 @@ +/** + * @file config.h + * common internal api header. + */ + +#ifndef _ODE_CONFIG_H_ +#define _ODE_CONFIG_H_ + +# ODE header stuff + +/* +typedef long int32; +typedef unsigned long uint32; +typedef short int16; +typedef unsigned short uint16; +typedef char int8; +typedef unsigned char uint8; +*/ + +#endif /* _ODE_CONFIG_H */