Fixes for 32-bit Windows #815

Author: erincatto

samples/main.cpp

@@ -68,7 +68,7 @@ void* AllocFcn( uint32_t size, int32_t alignment )
 	size_t sizeAligned = ( ( size - 1 ) | ( alignment - 1 ) ) + 1;
 	assert( ( sizeAligned & ( alignment - 1 ) ) == 0 );
 
-#if defined( _WIN64 )
+#if defined( _WIN64 ) || defined( _WIN32 )
 	void* ptr = _aligned_malloc( sizeAligned, alignment );
 #else
 	void* ptr = aligned_alloc( alignment, sizeAligned );
@@ -79,7 +79,7 @@ void* AllocFcn( uint32_t size, int32_t alignment )
 
 void FreeFcn( void* mem )
 {
-#if defined( _WIN64 )
+#if defined( _WIN64 ) || defined( _WIN32 )
 	_aligned_free( mem );
 #else
 	free( mem );

src/core.h

@@ -25,7 +25,7 @@
 #endif
 
 // Define platform
-#if defined( _WIN64 )
+#if defined(_WIN32) || defined(_WIN64)
 	#define B2_PLATFORM_WINDOWS
 #elif defined( __ANDROID__ )
 	#define B2_PLATFORM_ANDROID

src/timer.c

@@ -193,7 +193,7 @@ void b2Yield()
 uint32_t b2Hash( uint32_t hash, const uint8_t* data, int count )
 {
 	uint32_t result = hash;
-	for ( size_t i = 0; i < count; i++ )
+	for ( int i = 0; i < count; i++ )
 	{
 		result = ( result << 5 ) + result + data[i];
 	}