mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 19:08:55 -04:00
need config.h to prevent integer typedef collisions
This commit is contained in:
parent
fd6808e765
commit
ee9ea70f77
@ -11,4 +11,4 @@
|
|||||||
avcodec.h avformat.h avio.h avutil.h common.h integer.h \
|
avcodec.h avformat.h avio.h avutil.h common.h integer.h \
|
||||||
intfloat_readwrite.h mathematics.h rational.h rtp.h \
|
intfloat_readwrite.h mathematics.h rational.h rtp.h \
|
||||||
rtsp.h rtspcodes.h winsock2.h \
|
rtsp.h rtspcodes.h winsock2.h \
|
||||||
ode/common.h
|
ode/common.h ode/config.h
|
||||||
|
@ -6,8 +6,15 @@
|
|||||||
#ifndef COMMON_H
|
#ifndef COMMON_H
|
||||||
#define COMMON_H
|
#define COMMON_H
|
||||||
|
|
||||||
|
#endif /* COMMON_H */
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# ODE header stuff
|
# ODE header stuff
|
||||||
|
|
||||||
|
#ifndef _ODE_COMMON_H_
|
||||||
|
#define _ODE_COMMON_H_
|
||||||
|
|
||||||
#if defined(dSINGLE)
|
#if defined(dSINGLE)
|
||||||
typedef float dReal;
|
typedef float dReal;
|
||||||
#elif defined(dDOUBLE)
|
#elif defined(dDOUBLE)
|
||||||
@ -45,4 +52,4 @@ typedef struct dJointFeedback {
|
|||||||
dVector3 t2; /* torque applied to body 2 */
|
dVector3 t2; /* torque applied to body 2 */
|
||||||
} dJointFeedback;
|
} dJointFeedback;
|
||||||
|
|
||||||
#endif /* COMMON_H */
|
#endif /* _ODE_COMMON_H_ */
|
||||||
|
20
dtool/src/parser-inc/config.h
Executable file
20
dtool/src/parser-inc/config.h
Executable file
@ -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 */
|
Loading…
x
Reference in New Issue
Block a user