Browse Source

need config.h to prevent integer typedef collisions

Josh Wilson 19 years ago
parent
commit
ee9ea70f77
3 changed files with 29 additions and 2 deletions
  1. 1 1
      dtool/src/parser-inc/Sources.pp
  2. 8 1
      dtool/src/parser-inc/common.h
  3. 20 0
      dtool/src/parser-inc/config.h

+ 1 - 1
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

+ 8 - 1
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_ */

+ 20 - 0
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 */