diff --git a/Demos/OpenGL/DemoApplication.cpp b/Demos/OpenGL/DemoApplication.cpp index 2e6ae56cc..8b07cf91f 100644 --- a/Demos/OpenGL/DemoApplication.cpp +++ b/Demos/OpenGL/DemoApplication.cpp @@ -304,6 +304,7 @@ void DemoApplication::reshape(int w, int h) } + void DemoApplication::keyboardCallback(unsigned char key, int x, int y) { (void)x; diff --git a/Extras/Serialize/BulletFileLoader/btBulletFile.cpp b/Extras/Serialize/BulletFileLoader/btBulletFile.cpp index 44acc0d3c..69b3e2e50 100644 --- a/Extras/Serialize/BulletFileLoader/btBulletFile.cpp +++ b/Extras/Serialize/BulletFileLoader/btBulletFile.cpp @@ -26,17 +26,17 @@ subject to the following restrictions: // 32 && 64 bit versions #ifdef BT_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES #ifdef _WIN64 -extern unsigned char sBulletDNAstr64[]; +extern char sBulletDNAstr64[]; extern int sBulletDNAlen64; #else -extern unsigned char sBulletDNAstr[]; +extern char sBulletDNAstr[]; extern int sBulletDNAlen; #endif //_WIN64 #else//BT_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES -extern unsigned char sBulletDNAstr64[]; +extern char sBulletDNAstr64[]; extern int sBulletDNAlen64; -extern unsigned char sBulletDNAstr[]; +extern char sBulletDNAstr[]; extern int sBulletDNAlen; #endif //BT_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES diff --git a/src/LinearMath/btSerializer.cpp b/src/LinearMath/btSerializer.cpp index 9ed121925..49c25b7ea 100644 --- a/src/LinearMath/btSerializer.cpp +++ b/src/LinearMath/btSerializer.cpp @@ -1,4 +1,4 @@ -unsigned char sBulletDNAstr[]= { +char sBulletDNAstr[]= { 83,68,78,65,78,65,77,69,44,1,0,0,109,95,115,105,122,101,0,109, 95,99,97,112,97,99,105,116,121,0,42,109,95,100,97,116,97,0,109,95, 99,111,108,108,105,115,105,111,110,83,104,97,112,101,115,0,109,95,99,111, @@ -419,7 +419,7 @@ unsigned char sBulletDNAstr[]= { }; int sBulletDNAlen= sizeof(sBulletDNAstr); -unsigned char sBulletDNAstr64[]= { + char sBulletDNAstr64[]= { 83,68,78,65,78,65,77,69,44,1,0,0,109,95,115,105,122,101,0,109, 95,99,97,112,97,99,105,116,121,0,42,109,95,100,97,116,97,0,109,95, 99,111,108,108,105,115,105,111,110,83,104,97,112,101,115,0,109,95,99,111, diff --git a/src/LinearMath/btSerializer.h b/src/LinearMath/btSerializer.h index 3c64f6bdf..7d90ad20a 100644 --- a/src/LinearMath/btSerializer.h +++ b/src/LinearMath/btSerializer.h @@ -28,9 +28,9 @@ subject to the following restrictions: ///only the 32bit versions for now -extern unsigned char sBulletDNAstr[]; +extern char sBulletDNAstr[]; extern int sBulletDNAlen; -extern unsigned char sBulletDNAstr64[]; +extern char sBulletDNAstr64[]; extern int sBulletDNAlen64; SIMD_FORCE_INLINE int btStrLen(const char* str)