Index: extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
===================================================================
--- extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h	(revision 45947)
+++ extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h	(working copy)
@@ -78,10 +78,8 @@
 	int	getTriangleIndex() const
 	{
 		btAssert(isLeafNode());
-		unsigned int x=0;
-		unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);
 		// Get only the lower bits where the triangle index is stored
-		return (m_escapeIndexOrTriangleIndex&~(y));
+		return m_escapeIndexOrTriangleIndex&~(UINT_MAX<<(31-MAX_NUM_PARTS_IN_BITS));
 	}
 	int	getPartId() const
 	{
Index: extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
===================================================================
--- extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h	(revision 45947)
+++ extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h	(working copy)
@@ -45,9 +45,7 @@
 	int	getTriangleIndex() const
 	{
 		// Get only the lower bits where the triangle index is stored
-		unsigned int x = 0;
-		unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);
-		return (m_PartIdTriangleIndex&~(y));
+		return m_PartIdTriangleIndex&~(UINT_MAX<<(31-MAX_NUM_PARTS_IN_BITS));
 	}
 	int	getPartId() const
 	{
Index: extern/libopenjpeg/pi.c
===================================================================
--- extern/libopenjpeg/pi.c	(revision 45947)
+++ extern/libopenjpeg/pi.c	(working copy)
@@ -216,7 +216,7 @@
 						continue; 
 					}
 					
-					if ((res->pw==0)||(res->pw==0)) continue;
+					if ((res->pw==0)||(res->ph==0)) continue;
 					
 					if ((trx0==trx1)||(try0==try1)) continue;
 					
@@ -297,7 +297,7 @@
 						continue; 
 					}
 					
-					if ((res->pw==0)||(res->pw==0)) continue;
+					if ((res->pw==0)||(res->ph==0)) continue;
 					
 					if ((trx0==trx1)||(try0==try1)) continue;
 					
@@ -376,7 +376,7 @@
 						continue; 
 					}
 					
-					if ((res->pw==0)||(res->pw==0)) continue;
+					if ((res->pw==0)||(res->ph==0)) continue;
 					
 					if ((trx0==trx1)||(try0==try1)) continue;
 					
Index: extern/libopenjpeg/tcd.c
===================================================================
--- extern/libopenjpeg/tcd.c	(revision 45947)
+++ extern/libopenjpeg/tcd.c	(working copy)
@@ -647,9 +647,9 @@
 			tilec->y1 = int_ceildiv(tile->y1, image->comps[i].dy);
 
 			x0 = j == 0 ? tilec->x0 : int_min(x0, (unsigned int) tilec->x0);
-			y0 = j == 0 ? tilec->y0 : int_min(y0,	(unsigned int) tilec->x0);
-			x1 = j == 0 ? tilec->x1 : int_max(x1,	(unsigned int) tilec->x1);
-			y1 = j == 0 ? tilec->y1 : int_max(y1,	(unsigned int) tilec->y1);
+			y0 = j == 0 ? tilec->y0 : int_min(y0, (unsigned int) tilec->y0);
+			x1 = j == 0 ? tilec->x1 : int_max(x1, (unsigned int) tilec->x1);
+			y1 = j == 0 ? tilec->y1 : int_max(y1, (unsigned int) tilec->y1);
 		}
 
 		w = int_ceildivpow2(x1 - x0, image->comps[i].factor);
Index: intern/elbeem/intern/solver_relax.h
===================================================================
--- intern/elbeem/intern/solver_relax.h	(revision 45947)
+++ intern/elbeem/intern/solver_relax.h	(working copy)
@@ -390,7 +390,7 @@
 #define  DEFAULT_STREAM  \
 	m[dC] = RAC(ccel,dC); \
 	 \
-	if(((!nbored) & CFBnd)) { \
+	if(!(nbored & CFBnd)) { \
 	 \
 	m[dN ] = CSRC_N ; m[dS ] = CSRC_S ; \
 	m[dE ] = CSRC_E ; m[dW ] = CSRC_W ; \
Index: intern/ghost/intern/GHOST_NDOFManager.cpp
===================================================================
--- intern/ghost/intern/GHOST_NDOFManager.cpp	(revision 45947)
+++ intern/ghost/intern/GHOST_NDOFManager.cpp	(working copy)
@@ -286,7 +286,7 @@
 	}
 
 	if (m_buttonMask == 0)
-		m_buttonMask = ~(-1 << m_buttonCount);
+		m_buttonMask = (int) ~(UINT_MAX << m_buttonCount);
 
 #ifdef DEBUG_NDOF_BUTTONS
 	printf("ndof: %d buttons -> hex:%X\n", m_buttonCount, m_buttonMask);
Index: source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
===================================================================
--- source/gameengine/Physics/Bullet/CcdPhysicsController.cpp	(revision 45947)
+++ source/gameengine/Physics/Bullet/CcdPhysicsController.cpp	(working copy)
@@ -850,7 +850,7 @@
 
 }
 
-void		CcdPhysicsController::RelativeRotate(const float rotval[9],bool local)
+void		CcdPhysicsController::RelativeRotate(const float rotval[12],bool local)
 {
 	if (m_object)
 	{
Index: source/gameengine/Physics/Bullet/CcdPhysicsController.h
===================================================================
--- source/gameengine/Physics/Bullet/CcdPhysicsController.h	(revision 45947)
+++ source/gameengine/Physics/Bullet/CcdPhysicsController.h	(working copy)
@@ -481,7 +481,7 @@
 
 		// kinematic methods
 		virtual void		RelativeTranslate(float dlocX,float dlocY,float dlocZ,bool local);
-		virtual void		RelativeRotate(const float drot[9],bool local);
+		virtual void		RelativeRotate(const float drot[12],bool local);
 		virtual	void		getOrientation(float &quatImag0,float &quatImag1,float &quatImag2,float &quatReal);
 		virtual	void		setOrientation(float quatImag0,float quatImag1,float quatImag2,float quatReal);
 		virtual	void		setPosition(float posX,float posY,float posZ);