add the BT_ prefix for all #ifdef guards, to avoid conflicts with developers own header defines.

Fixes Issue 497

//license header
#ifndef BT_RIGIDBODY_H
#define BT_RIGIDBODY_H
class btRigidBody
{
};
#endif //BT_RIGIDBODY_H

src/BulletMultiThreaded/HeapManager.h

@@ -14,8 +14,8 @@ subject to the following restrictions:
 
 */
 
-#ifndef __HEAP_MANAGER_H__
-#define __HEAP_MANAGER_H__
+#ifndef BT_HEAP_MANAGER_H__
+#define BT_HEAP_MANAGER_H__
 
 #ifdef __SPU__
 	#define HEAP_STACK_SIZE 32
@@ -113,4 +113,5 @@ public:
 
 };
 
-#endif
+#endif //BT_HEAP_MANAGER_H__
+

src/BulletMultiThreaded/PlatformDefinitions.h

@@ -1,5 +1,5 @@
-#ifndef TYPE_DEFINITIONS_H
-#define TYPE_DEFINITIONS_H
+#ifndef BT_TYPE_DEFINITIONS_H
+#define BT_TYPE_DEFINITIONS_H
 
 ///This file provides some platform/compiler checks for common definitions
 #include "LinearMath/btScalar.h"
@@ -93,7 +93,7 @@ typedef union
 /* Included here because we need uint*_t typedefs */
 #include "PpuAddressSpace.h"
 
-#endif //TYPE_DEFINITIONS_H
+#endif //BT_TYPE_DEFINITIONS_H
 
 
 

src/BulletMultiThreaded/PosixThreadSupport.h

@@ -13,19 +13,22 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
+#ifndef BT_POSIX_THREAD_SUPPORT_H
+#define BT_POSIX_THREAD_SUPPORT_H
+
+#ifdef USE_PTHREADS  //platform specific defines are defined in PlatformDefinitions.h
 
 #include "LinearMath/btScalar.h"
 #include "PlatformDefinitions.h"
 
-#ifdef USE_PTHREADS  //platform specific defines are defined in PlatformDefinitions.h
+
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 600 //for definition of pthread_barrier_t, see http://pages.cs.wisc.edu/~travitch/pthreads_primer.html
 #endif //_XOPEN_SOURCE
 #include <pthread.h>
 #include <semaphore.h>
 
-#ifndef POSIX_THREAD_SUPPORT_H
-#define POSIX_THREAD_SUPPORT_H
+
 
 #include "LinearMath/btAlignedObjectArray.h"
 
@@ -132,6 +135,8 @@ public:
 
 };
 
-#endif // POSIX_THREAD_SUPPORT_H
-
 #endif // USE_PTHREADS
+
+#endif // BT_POSIX_THREAD_SUPPORT_H
+
+

src/BulletMultiThreaded/PpuAddressSpace.h

@@ -14,8 +14,8 @@ subject to the following restrictions:
 */
 
 
-#ifndef __PPU_ADDRESS_SPACE_H
-#define __PPU_ADDRESS_SPACE_H
+#ifndef BT_PPU_ADDRESS_SPACE_H
+#define BT_PPU_ADDRESS_SPACE_H
 
 
 #ifdef _WIN32
@@ -33,5 +33,5 @@ subject to the following restrictions:
 	typedef uint32_t ppu_address_t;
 #endif //defined(_WIN64)
 
-#endif //__PPU_ADDRESS_SPACE_H
+#endif //BT_PPU_ADDRESS_SPACE_H
 

src/BulletMultiThreaded/SequentialThreadSupport.h

@@ -17,8 +17,8 @@ subject to the following restrictions:
 #include "PlatformDefinitions.h"
 
 
-#ifndef SEQUENTIAL_THREAD_SUPPORT_H
-#define SEQUENTIAL_THREAD_SUPPORT_H
+#ifndef BT_SEQUENTIAL_THREAD_SUPPORT_H
+#define BT_SEQUENTIAL_THREAD_SUPPORT_H
 
 #include "LinearMath/btAlignedObjectArray.h"
 
@@ -92,5 +92,5 @@ public:
 
 };
 
-#endif //SEQUENTIAL_THREAD_SUPPORT_H
+#endif //BT_SEQUENTIAL_THREAD_SUPPORT_H
 

src/BulletMultiThreaded/SpuCollisionObjectWrapper.h

@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SPU_COLLISION_OBJECT_WRAPPER_H
-#define SPU_COLLISION_OBJECT_WRAPPER_H
+#ifndef BT_SPU_COLLISION_OBJECT_WRAPPER_H
+#define BT_SPU_COLLISION_OBJECT_WRAPPER_H
 
 #include "PlatformDefinitions.h"
 #include "BulletCollision/CollisionDispatch/btCollisionObject.h"
@@ -37,4 +37,4 @@ public:
 };
 
 
-#endif //SPU_COLLISION_OBJECT_WRAPPER_H
+#endif //BT_SPU_COLLISION_OBJECT_WRAPPER_H

src/BulletMultiThreaded/SpuCollisionTaskProcess.h

@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SPU_COLLISION_TASK_PROCESS_H
-#define SPU_COLLISION_TASK_PROCESS_H
+#ifndef BT_SPU_COLLISION_TASK_PROCESS_H
+#define BT_SPU_COLLISION_TASK_PROCESS_H
 
 #include <assert.h>
 
@@ -159,5 +159,5 @@ public:
 #define MIDPHASE_NUM_WORKUNITS_PER_TASK (MIDPHASE_NUM_WORKUNITS_PER_PAGE*MIDPHASE_NUM_WORKUNIT_PAGES)
 
 
-#endif // SPU_COLLISION_TASK_PROCESS_H
+#endif // BT_SPU_COLLISION_TASK_PROCESS_H
 

src/BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.h

@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SPU_CONTACTMANIFOLD_COLLISION_ALGORITHM_H
-#define SPU_CONTACTMANIFOLD_COLLISION_ALGORITHM_H
+#ifndef BT_SPU_CONTACTMANIFOLD_COLLISION_ALGORITHM_H
+#define BT_SPU_CONTACTMANIFOLD_COLLISION_ALGORITHM_H
 
 #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
@@ -117,4 +117,4 @@ public:
 
 };
 
-#endif //SPU_CONTACTMANIFOLD_COLLISION_ALGORITHM_H
+#endif //BT_SPU_CONTACTMANIFOLD_COLLISION_ALGORITHM_H

src/BulletMultiThreaded/SpuDoubleBuffer.h

@@ -1,5 +1,21 @@
-#ifndef DOUBLE_BUFFER_H
-#define DOUBLE_BUFFER_H
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2007 Erwin Coumans  http://bulletphysics.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+#ifndef BT_DOUBLE_BUFFER_H
+#define BT_DOUBLE_BUFFER_H
 
 #include "SpuFakeDma.h"
 #include "LinearMath/btScalar.h"

src/BulletMultiThreaded/SpuFakeDma.h

@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef FAKE_DMA_H
-#define FAKE_DMA_H
+#ifndef BT_FAKE_DMA_H
+#define BT_FAKE_DMA_H
 
 
 #include "PlatformDefinitions.h"
@@ -132,4 +132,4 @@ void*	cellDmaGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uin
 void*	cellDmaSmallGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid);
 
 
-#endif //FAKE_DMA_H
+#endif //BT_FAKE_DMA_H

src/BulletMultiThreaded/SpuGatheringCollisionDispatcher.h

@@ -12,8 +12,8 @@ subject to the following restrictions:
 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 */
-#ifndef SPU_GATHERING_COLLISION__DISPATCHER_H
-#define SPU_GATHERING_COLLISION__DISPATCHER_H
+#ifndef BT_SPU_GATHERING_COLLISION__DISPATCHER_H
+#define BT_SPU_GATHERING_COLLISION__DISPATCHER_H
 
 #include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
 
@@ -67,6 +67,6 @@ public:
 
 
 
-#endif //SPU_GATHERING_COLLISION__DISPATCHER_H
+#endif //BT_SPU_GATHERING_COLLISION__DISPATCHER_H
 
 

src/BulletMultiThreaded/SpuLibspe2Support.h

@@ -14,8 +14,8 @@ subject to the following restrictions:
 */
 
 
-#ifndef SPU_LIBSPE2_SUPPORT_H
-#define SPU_LIBSPE2_SUPPORT_H
+#ifndef BT_SPU_LIBSPE2_SUPPORT_H
+#define BT_SPU_LIBSPE2_SUPPORT_H
 
 #include <LinearMath/btScalar.h> //for uint32_t etc.
 
@@ -173,7 +173,7 @@ private:
 
 #endif //USE_LIBSPE2
 
-#endif //SPU_LIBSPE2_SUPPORT_H
+#endif //BT_SPU_LIBSPE2_SUPPORT_H
 
 
 

src/BulletMultiThreaded/SpuSampleTaskProcess.h

@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SPU_SAMPLE_TASK_PROCESS_H
-#define SPU_SAMPLE_TASK_PROCESS_H
+#ifndef BT_SPU_SAMPLE_TASK_PROCESS_H
+#define BT_SPU_SAMPLE_TASK_PROCESS_H
 
 #include <assert.h>
 
@@ -149,5 +149,5 @@ int main(unsigned long long speid, addr64 argp, addr64 envp)
 
 
 
-#endif // SPU_SAMPLE_TASK_PROCESS_H
+#endif // BT_SPU_SAMPLE_TASK_PROCESS_H
 

src/BulletMultiThreaded/SpuSync.h

@@ -15,8 +15,8 @@ subject to the following restrictions:
 Written by: Marten Svanfeldt
 */
 
-#ifndef SPU_SYNC_H
-#define	SPU_SYNC_H
+#ifndef BT_SPU_SYNC_H
+#define	BT_SPU_SYNC_H
 
 
 #include "PlatformDefinitions.h"
@@ -145,4 +145,5 @@ private:
 #endif
 
 
-#endif
+#endif //BT_SPU_SYNC_H
+

src/BulletMultiThreaded/TrbDynBody.h

@@ -14,8 +14,8 @@ subject to the following restrictions:
 
 */
 
-#ifndef __T_RB_DYN_BODY_H__
-#define __T_RB_DYN_BODY_H__
+#ifndef BT_RB_DYN_BODY_H__
+#define BT_RB_DYN_BODY_H__
 
 #include "vectormath/vmInclude.h"
 using namespace Vectormath::Aos;
@@ -75,4 +75,5 @@ public:
 	CollObject*    fCollObject;  // Collision object corresponding the RB
 } __attribute__ ((aligned(16)));
 
-#endif /* __T_RB_DYN_BODY_H__ */
+#endif //BT_RB_DYN_BODY_H__
+

src/BulletMultiThreaded/TrbStateVec.h

@@ -14,8 +14,8 @@ subject to the following restrictions:
 
 */
 
-#ifndef __TRBSTATEVEC_H__
-#define __TRBSTATEVEC_H__
+#ifndef BT_TRBSTATEVEC_H__
+#define BT_TRBSTATEVEC_H__
 
 #include <stdlib.h>
 #ifdef PFX_USE_FREE_VECTORMATH
@@ -334,5 +334,6 @@ void TrbState::reset()
 	angularDamping = 0.99f;
 }
 
-#endif /* __TRBSTATEVEC_H__ */
+#endif //BT_TRBSTATEVEC_H__
+
 

src/BulletMultiThreaded/Win32ThreadSupport.h

@@ -18,8 +18,8 @@ subject to the following restrictions:
 
 #ifdef USE_WIN32_THREADING  //platform specific defines are defined in PlatformDefinitions.h
 
-#ifndef WIN32_THREAD_SUPPORT_H
-#define WIN32_THREAD_SUPPORT_H
+#ifndef BT_WIN32_THREAD_SUPPORT_H
+#define BT_WIN32_THREAD_SUPPORT_H
 
 #include "LinearMath/btAlignedObjectArray.h"
 
@@ -133,6 +133,6 @@ public:
 
 };
 
-#endif //WIN32_THREAD_SUPPORT_H
+#endif //BT_WIN32_THREAD_SUPPORT_H
 
 #endif //USE_WIN32_THREADING

src/BulletMultiThreaded/btThreadSupportInterface.h

@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef THREAD_SUPPORT_INTERFACE_H
-#define THREAD_SUPPORT_INTERFACE_H
+#ifndef BT_THREAD_SUPPORT_INTERFACE_H
+#define BT_THREAD_SUPPORT_INTERFACE_H
 
 
 #include <LinearMath/btScalar.h> //for ATTRIBUTE_ALIGNED16
@@ -81,5 +81,5 @@ public:
 
 };
 
-#endif //THREAD_SUPPORT_INTERFACE_H
+#endif //BT_THREAD_SUPPORT_INTERFACE_H
 

src/BulletMultiThreaded/vectormath2bullet.h

@@ -27,8 +27,8 @@
    POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef AOS_VECTORMATH_BULLET_CONVERT_H
-#define AOS_VECTORMATH_BULLET_CONVERT_H
+#ifndef BT_AOS_VECTORMATH_BULLET_CONVERT_H
+#define BT_AOS_VECTORMATH_BULLET_CONVERT_H
 
 #include "PlatformDefinitions.h"
 #include "LinearMath/btVector3.h"
@@ -70,4 +70,4 @@ inline Vectormath::Aos::Matrix3	getVmMatrix3(const btMatrix3x3& btMat)
 }
 
 
-#endif //AOS_VECTORMATH_BULLET_CONVERT_H
+#endif //BT_AOS_VECTORMATH_BULLET_CONVERT_H