Get rid of MSVC's __int64

Use either int64_t, uint64_t or long long and unsigned long long, defined as per C++11 standard

Minecraft.Client/PSVita/Iggy/include/rrCore.h

@@ -114,8 +114,8 @@
   #define __RADLITTLEENDIAN__
   #ifdef __i386__
     #define __RADX86__
-  #else 
-    #define __RADARM__       
+  #else
+    #define __RADARM__
   #endif
   #define RADINLINE inline
   #define RADRESTRICT __restrict
@@ -132,7 +132,7 @@
   #define __RADX86__
 #else
   #error Unknown processor
-#endif    
+#endif
   #define __RADLITTLEENDIAN__
   #define RADINLINE inline
   #define RADRESTRICT __restrict
@@ -155,7 +155,7 @@
       #define __RADNACL__
       #define __RAD32__
       #define __RADLITTLEENDIAN__
-      #define __RADX86__           
+      #define __RADX86__
       #define RADINLINE inline
       #define RADRESTRICT __restrict
 
@@ -196,7 +196,7 @@
       #define __RAD64REGS__
       #define __RADLITTLEENDIAN__
       #define RADINLINE inline
-      #define RADRESTRICT __restrict    
+      #define RADRESTRICT __restrict
 
       #undef  RADSTRUCT
       #define RADSTRUCT struct __attribute__((__packed__))
@@ -265,7 +265,7 @@
       #endif
       #undef RADSTRUCT
       #define RADSTRUCT struct __attribute__((__packed__))
-      
+
     #elif defined(CAFE) // has to be before HOLLYWOOD_REV since it also defines it
 
       #define __RADWIIU__
@@ -480,7 +480,7 @@
 
           #undef RADRESTRICT  /* could have been defined above... */
           #define RADRESTRICT __restrict
-        
+
           #undef RADSTRUCT
           #define RADSTRUCT struct __attribute__((__packed__))
         #endif
@@ -885,7 +885,7 @@
       #define RAD_ALIGN(type,var,num) type __declspec(align(num)) var
     #else
       // NOTE: / / is a guaranteed parse error in C/C++.
-      #define RAD_ALIGN(type,var,num) RAD_ALIGN_USED_BUT_NOT_DEFINED / / 
+      #define RAD_ALIGN(type,var,num) RAD_ALIGN_USED_BUT_NOT_DEFINED / /
     #endif
 
 	// WARNING : RAD_TLS should really only be used for debug/tools stuff
@@ -917,8 +917,8 @@
         #define RAD_S32 signed int
         // But pointers are 64 bits.
         #if (_MSC_VER >= 1300 && defined(_Wp64) && _Wp64 )
-          #define RAD_SINTa __w64 signed __int64
-          #define RAD_UINTa __w64 unsigned __int64
+          #define RAD_SINTa __w64 signed long long
+          #define RAD_UINTa __w64 unsigned long long
         #else // non-vc.net compiler or /Wp64 turned off
           #define RAD_UINTa unsigned long long
           #define RAD_SINTa signed long long
@@ -976,8 +976,8 @@
       #define RAD_U64 unsigned long long
       #define RAD_S64 signed long long
     #elif defined(__RADX64__) || defined(__RAD32__)
-      #define RAD_U64 unsigned __int64
-      #define RAD_S64 signed __int64
+      #define RAD_U64 unsigned long long
+      #define RAD_S64 signed long long
     #else
       // 16-bit
       typedef RADSTRUCT RAD_U64  // do this so that we don't accidentally use U64s
@@ -1134,7 +1134,7 @@
 
     // helpers for doing an if ( ) with expect :
     // if ( RAD_LIKELY(expr) ) { ... }
-    
+
     #define RAD_LIKELY(expr)            RAD_EXPECT(expr,1)
     #define RAD_UNLIKELY(expr)          RAD_EXPECT(expr,0)
 
@@ -1324,7 +1324,7 @@
        __pragma(warning(push)) \
       __pragma(warning(disable:4127)) \
     } while(0) \
-    __pragma(warning(pop)) 
+    __pragma(warning(pop))
 
     #define RAD_STATEMENT_END_TRUE \
        __pragma(warning(push)) \
@@ -1333,10 +1333,10 @@
     __pragma(warning(pop))
 
   #else
-    #define RAD_USE_STANDARD_LOOP_CONSTRUCT  
+    #define RAD_USE_STANDARD_LOOP_CONSTRUCT
   #endif
 #else
-    #define RAD_USE_STANDARD_LOOP_CONSTRUCT  
+    #define RAD_USE_STANDARD_LOOP_CONSTRUCT
 #endif
 
 #ifdef RAD_USE_STANDARD_LOOP_CONSTRUCT
@@ -1345,7 +1345,7 @@
 
   #define RAD_STATEMENT_END_FALSE \
     } while ( (void)0,0 )
-    
+
   #define RAD_STATEMENT_END_TRUE \
     } while ( (void)1,1 )
 
@@ -1355,7 +1355,7 @@
   RAD_STATEMENT_START \
     code \
   RAD_STATEMENT_END_FALSE
-  
+
 #define RAD_INFINITE_LOOP( code ) \
   RAD_STATEMENT_START \
     code \
@@ -1363,7 +1363,7 @@
 
 
 // Must be placed after variable declarations for code compiled as .c
-#if defined(_MSC_VER) && _MSC_VER >= 1700 // in 2012 aka 11.0 and later 
+#if defined(_MSC_VER) && _MSC_VER >= 1700 // in 2012 aka 11.0 and later
 #   define RR_UNUSED_VARIABLE(x) (void) x
 #else
 #   define RR_UNUSED_VARIABLE(x) (void)(sizeof(x))
@@ -1473,7 +1473,7 @@
   // just to make gcc shut up about derefing null :
   #define RR_MEMBER_OFFSET_PTR(type,member,ptr)  ( (SINTa) &(((type *)(ptr))->member)  - (SINTa)(ptr) )
   #define RR_MEMBER_SIZE_PTR(type,member,ptr)	( sizeof( ((type *) (ptr))->member) )
-   
+
   // MEMBER_TO_OWNER takes a pointer to a member and gives you back the base of the object
   //  you should then RR_ASSERT( &(ret->member) == ptr );
   #define RR_MEMBER_TO_OWNER(type,member,ptr)    (type *)( ((char *)(ptr)) - RR_MEMBER_OFFSET_PTR(type,member,ptr) )
@@ -1482,7 +1482,7 @@
 // Cache / prefetch macros :
 
 // RR_PREFETCH for various platforms :
-// 
+//
 // RR_PREFETCH_SEQUENTIAL : prefetch memory for reading in a sequential scan
 //		platforms that automatically prefetch sequential (eg. PC) should be a no-op here
 // RR_PREFETCH_WRITE_INVALIDATE : prefetch memory for writing - contents of memory are undefined
@@ -1707,7 +1707,7 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion;
 #define rrDisplayAssertion(i,n,l,f,m)	( ( g_fp_rrDisplayAssertion ) ? (*g_fp_rrDisplayAssertion)(i,n,l,f,m) : 1 )
 
 //-----------------------------------------------------------
-      
+
 // RAD_NO_BREAK : option if you don't like your assert to break
 //  CB : RR_BREAK is *always* a break ; RR_ASSERT_BREAK is optional
 #ifdef RAD_NO_BREAK
@@ -1725,7 +1725,7 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion;
 #define RR_ASSERT_LITE_ALWAYS(exp)     RAD_STATEMENT_WRAPPER( if ( ! (exp) ) { RR_ASSERT_BREAK(); } )
 
 //-----------------------------------
-#ifdef RR_DO_ASSERTS 
+#ifdef RR_DO_ASSERTS
 
 #define RR_ASSERT(exp)           RR_ASSERT_ALWAYS(exp)
 #define RR_ASSERT_LITE(exp)      RR_ASSERT_LITE_ALWAYS(exp)
@@ -1883,7 +1883,7 @@ unsigned long  __cdecl _byteswap_ulong  (unsigned long  _Long);
 #define RR_BSWAP16   _byteswap_ushort
 #define RR_BSWAP32  _byteswap_ulong
 
-unsigned __int64 __cdecl _byteswap_uint64 (unsigned __int64 val);
+unsigned long long __cdecl _byteswap_uint64 (unsigned long long val);
 #pragma intrinsic(_byteswap_uint64)
 #define RR_BSWAP64  _byteswap_uint64
 
@@ -1909,7 +1909,7 @@ RADFORCEINLINE unsigned long RR_BSWAP32 (unsigned long _Long)
    return _Long;
 }
 
-RADFORCEINLINE unsigned __int64 RR_BSWAP64 (unsigned __int64 _Long)
+RADFORCEINLINE unsigned long long RR_BSWAP64 (unsigned long long _Long)
 {
    __asm {
       mov eax, DWORD PTR _Long
@@ -2250,10 +2250,10 @@ void           __storewordbytereverse (unsigned int   val, int offset, void *bas
 
 #if ( defined(_MSC_VER) && _MSC_VER >= 1300)
 
-unsigned __int64 __cdecl _rotl64(unsigned __int64 _Val, int _Shift);
+unsigned long long __cdecl _rotl64(unsigned long long _Val, int _Shift);
 #pragma intrinsic(_rotl64)
 
-#define RR_ROTL64(x,k)  _rotl64((unsigned __int64)(x),(int)(k))
+#define RR_ROTL64(x,k)  _rotl64((unsigned long long)(x),(int)(k))
 
 #elif defined(__RADCELL__)
 
@@ -2262,7 +2262,7 @@ unsigned __int64 __cdecl _rotl64(unsigned __int64 _Val, int _Shift);
 
 #elif defined(__RADLINUX__) || defined(__RADMACAPI__)
 
-//APTODO: Just to compile linux. Should we be doing better than this? If not, combine with above. 
+//APTODO: Just to compile linux. Should we be doing better than this? If not, combine with above.
 #define RR_ROTL64(u64,num)  ( ( (u64) << (num) ) | ( (u64) >> (64 - (num))) )
 
 #else

Minecraft.Client/PSVita/Miles/include/rrCore.h

@@ -114,8 +114,8 @@
   #define __RADLITTLEENDIAN__
   #ifdef __i386__
     #define __RADX86__
-  #else 
-    #define __RADARM__       
+  #else
+    #define __RADARM__
   #endif
   #define RADINLINE inline
   #define RADRESTRICT __restrict
@@ -132,7 +132,7 @@
   #define __RADX86__
 #else
   #error Unknown processor
-#endif    
+#endif
   #define __RADLITTLEENDIAN__
   #define RADINLINE inline
   #define RADRESTRICT __restrict
@@ -155,7 +155,7 @@
       #define __RADNACL__
       #define __RAD32__
       #define __RADLITTLEENDIAN__
-      #define __RADX86__           
+      #define __RADX86__
       #define RADINLINE inline
       #define RADRESTRICT __restrict
 
@@ -196,7 +196,7 @@
       #define __RAD64REGS__
       #define __RADLITTLEENDIAN__
       #define RADINLINE inline
-      #define RADRESTRICT __restrict    
+      #define RADRESTRICT __restrict
 
       #undef  RADSTRUCT
       #define RADSTRUCT struct __attribute__((__packed__))
@@ -265,7 +265,7 @@
       #endif
       #undef RADSTRUCT
       #define RADSTRUCT struct __attribute__((__packed__))
-      
+
     #elif defined(CAFE) // has to be before HOLLYWOOD_REV since it also defines it
 
       #define __RADWIIU__
@@ -480,7 +480,7 @@
 
           #undef RADRESTRICT  /* could have been defined above... */
           #define RADRESTRICT __restrict
-        
+
           #undef RADSTRUCT
           #define RADSTRUCT struct __attribute__((__packed__))
         #endif
@@ -885,7 +885,7 @@
       #define RAD_ALIGN(type,var,num) type __declspec(align(num)) var
     #else
       // NOTE: / / is a guaranteed parse error in C/C++.
-      #define RAD_ALIGN(type,var,num) RAD_ALIGN_USED_BUT_NOT_DEFINED / / 
+      #define RAD_ALIGN(type,var,num) RAD_ALIGN_USED_BUT_NOT_DEFINED / /
     #endif
 
 	// WARNING : RAD_TLS should really only be used for debug/tools stuff
@@ -917,8 +917,8 @@
         #define RAD_S32 signed int
         // But pointers are 64 bits.
         #if (_MSC_VER >= 1300 && defined(_Wp64) && _Wp64 )
-          #define RAD_SINTa __w64 signed __int64
-          #define RAD_UINTa __w64 unsigned __int64
+          #define RAD_SINTa __w64 signed long long
+          #define RAD_UINTa __w64 unsigned long long
         #else // non-vc.net compiler or /Wp64 turned off
           #define RAD_UINTa unsigned long long
           #define RAD_SINTa signed long long
@@ -976,8 +976,8 @@
       #define RAD_U64 unsigned long long
       #define RAD_S64 signed long long
     #elif defined(__RADX64__) || defined(__RAD32__)
-      #define RAD_U64 unsigned __int64
-      #define RAD_S64 signed __int64
+      #define RAD_U64 unsigned long long
+      #define RAD_S64 signed long long
     #else
       // 16-bit
       typedef RADSTRUCT RAD_U64  // do this so that we don't accidentally use U64s
@@ -1134,7 +1134,7 @@
 
     // helpers for doing an if ( ) with expect :
     // if ( RAD_LIKELY(expr) ) { ... }
-    
+
     #define RAD_LIKELY(expr)            RAD_EXPECT(expr,1)
     #define RAD_UNLIKELY(expr)          RAD_EXPECT(expr,0)
 
@@ -1324,7 +1324,7 @@
        __pragma(warning(push)) \
       __pragma(warning(disable:4127)) \
     } while(0) \
-    __pragma(warning(pop)) 
+    __pragma(warning(pop))
 
     #define RAD_STATEMENT_END_TRUE \
        __pragma(warning(push)) \
@@ -1333,10 +1333,10 @@
     __pragma(warning(pop))
 
   #else
-    #define RAD_USE_STANDARD_LOOP_CONSTRUCT  
+    #define RAD_USE_STANDARD_LOOP_CONSTRUCT
   #endif
 #else
-    #define RAD_USE_STANDARD_LOOP_CONSTRUCT  
+    #define RAD_USE_STANDARD_LOOP_CONSTRUCT
 #endif
 
 #ifdef RAD_USE_STANDARD_LOOP_CONSTRUCT
@@ -1345,7 +1345,7 @@
 
   #define RAD_STATEMENT_END_FALSE \
     } while ( (void)0,0 )
-    
+
   #define RAD_STATEMENT_END_TRUE \
     } while ( (void)1,1 )
 
@@ -1355,7 +1355,7 @@
   RAD_STATEMENT_START \
     code \
   RAD_STATEMENT_END_FALSE
-  
+
 #define RAD_INFINITE_LOOP( code ) \
   RAD_STATEMENT_START \
     code \
@@ -1363,7 +1363,7 @@
 
 
 // Must be placed after variable declarations for code compiled as .c
-#if defined(_MSC_VER) && _MSC_VER >= 1700 // in 2012 aka 11.0 and later 
+#if defined(_MSC_VER) && _MSC_VER >= 1700 // in 2012 aka 11.0 and later
 #   define RR_UNUSED_VARIABLE(x) (void) x
 #else
 #   define RR_UNUSED_VARIABLE(x) (void)(sizeof(x))
@@ -1473,7 +1473,7 @@
   // just to make gcc shut up about derefing null :
   #define RR_MEMBER_OFFSET_PTR(type,member,ptr)  ( (SINTa) &(((type *)(ptr))->member)  - (SINTa)(ptr) )
   #define RR_MEMBER_SIZE_PTR(type,member,ptr)	( sizeof( ((type *) (ptr))->member) )
-   
+
   // MEMBER_TO_OWNER takes a pointer to a member and gives you back the base of the object
   //  you should then RR_ASSERT( &(ret->member) == ptr );
   #define RR_MEMBER_TO_OWNER(type,member,ptr)    (type *)( ((char *)(ptr)) - RR_MEMBER_OFFSET_PTR(type,member,ptr) )
@@ -1482,7 +1482,7 @@
 // Cache / prefetch macros :
 
 // RR_PREFETCH for various platforms :
-// 
+//
 // RR_PREFETCH_SEQUENTIAL : prefetch memory for reading in a sequential scan
 //		platforms that automatically prefetch sequential (eg. PC) should be a no-op here
 // RR_PREFETCH_WRITE_INVALIDATE : prefetch memory for writing - contents of memory are undefined
@@ -1707,7 +1707,7 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion;
 #define rrDisplayAssertion(i,n,l,f,m)	( ( g_fp_rrDisplayAssertion ) ? (*g_fp_rrDisplayAssertion)(i,n,l,f,m) : 1 )
 
 //-----------------------------------------------------------
-      
+
 // RAD_NO_BREAK : option if you don't like your assert to break
 //  CB : RR_BREAK is *always* a break ; RR_ASSERT_BREAK is optional
 #ifdef RAD_NO_BREAK
@@ -1725,7 +1725,7 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion;
 #define RR_ASSERT_LITE_ALWAYS(exp)     RAD_STATEMENT_WRAPPER( if ( ! (exp) ) { RR_ASSERT_BREAK(); } )
 
 //-----------------------------------
-#ifdef RR_DO_ASSERTS 
+#ifdef RR_DO_ASSERTS
 
 #define RR_ASSERT(exp)           RR_ASSERT_ALWAYS(exp)
 #define RR_ASSERT_LITE(exp)      RR_ASSERT_LITE_ALWAYS(exp)
@@ -1883,7 +1883,7 @@ unsigned long  __cdecl _byteswap_ulong  (unsigned long  _Long);
 #define RR_BSWAP16   _byteswap_ushort
 #define RR_BSWAP32  _byteswap_ulong
 
-unsigned __int64 __cdecl _byteswap_uint64 (unsigned __int64 val);
+unsigned long long __cdecl _byteswap_uint64 (unsigned long long val);
 #pragma intrinsic(_byteswap_uint64)
 #define RR_BSWAP64  _byteswap_uint64
 
@@ -1909,7 +1909,7 @@ RADFORCEINLINE unsigned long RR_BSWAP32 (unsigned long _Long)
    return _Long;
 }
 
-RADFORCEINLINE unsigned __int64 RR_BSWAP64 (unsigned __int64 _Long)
+RADFORCEINLINE unsigned long long RR_BSWAP64 (unsigned long long _Long)
 {
    __asm {
       mov eax, DWORD PTR _Long
@@ -2250,10 +2250,10 @@ void           __storewordbytereverse (unsigned int   val, int offset, void *bas
 
 #if ( defined(_MSC_VER) && _MSC_VER >= 1300)
 
-unsigned __int64 __cdecl _rotl64(unsigned __int64 _Val, int _Shift);
+unsigned long long __cdecl _rotl64(unsigned long long _Val, int _Shift);
 #pragma intrinsic(_rotl64)
 
-#define RR_ROTL64(x,k)  _rotl64((unsigned __int64)(x),(int)(k))
+#define RR_ROTL64(x,k)  _rotl64((unsigned long long)(x),(int)(k))
 
 #elif defined(__RADCELL__)
 
@@ -2262,7 +2262,7 @@ unsigned __int64 __cdecl _rotl64(unsigned __int64 _Val, int _Shift);
 
 #elif defined(__RADLINUX__) || defined(__RADMACAPI__)
 
-//APTODO: Just to compile linux. Should we be doing better than this? If not, combine with above. 
+//APTODO: Just to compile linux. Should we be doing better than this? If not, combine with above.
 #define RR_ROTL64(u64,num)  ( ( (u64) << (num) ) | ( (u64) >> (64 - (num))) )
 
 #else

Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.cpp

@@ -44,12 +44,12 @@ void SonyRemoteStorage_Vita::internalCallback(const SceRemoteStorageEvent event,
 		break;
 
 	case GET_DATA_RESULT:
-		if(retCode >= 0) 
+		if(retCode >= 0)
 		{
 			app.DebugPrintf("Get Data success \n");
 			m_status = e_getDataSucceeded;
-		} 
-		else 
+		}
+		else
 		{
 			app.DebugPrintf("An error occurred while Get Data was being processed. retCode: 0x%x \n", retCode);
 			m_status = e_error;
@@ -66,12 +66,12 @@ void SonyRemoteStorage_Vita::internalCallback(const SceRemoteStorageEvent event,
 		break;
 
 	case GET_STATUS_RESULT:
-		if(retCode >= 0) 
+		if(retCode >= 0)
 		{
 			app.DebugPrintf("Get Status success \n");
 			app.DebugPrintf("Remaining Syncs for this user: %llu\n", outputGetStatus->remainingSyncs);
 			app.DebugPrintf("Number of files on the cloud: %d\n", outputGetStatus->numFiles);
-			for(int i = 0; i < outputGetStatus->numFiles; i++) 
+			for(int i = 0; i < outputGetStatus->numFiles; i++)
 			{
 				app.DebugPrintf("\n*** File %d information: ***\n", (i + 1));
 				app.DebugPrintf("File name: %s \n", outputGetStatus->data[i].fileName);
@@ -82,8 +82,8 @@ void SonyRemoteStorage_Vita::internalCallback(const SceRemoteStorageEvent event,
 				app.DebugPrintf("Visibility: \"%s\" \n", (outputGetStatus->data[i].visibility ==  0)?"Private":((outputGetStatus->data[i].visibility ==  1)?"Public read only":"Public read and write"));
 			}
 			m_status = e_getStatusSucceeded;
-		} 
-		else 
+		}
+		else
 		{
 			app.DebugPrintf("An error occurred while Get Status was being processed. retCode: 0x%x \n", retCode);
 			m_status = e_error;
@@ -98,12 +98,12 @@ void SonyRemoteStorage_Vita::internalCallback(const SceRemoteStorageEvent event,
 		break;
 
 	case SET_DATA_RESULT:
-		if(retCode >= 0) 
+		if(retCode >= 0)
 		{
 			app.DebugPrintf("Set Data success \n");
 			m_status = e_setDataSucceeded;
-		} 
-		else 
+		}
+		else
 		{
 			app.DebugPrintf("An error occurred while Set Data was being processed. retCode: 0x%x \n", retCode);
 			m_status = e_error;
@@ -175,19 +175,19 @@ bool SonyRemoteStorage_Vita::init(CallbackFunc cb, LPVOID lpParam)
 
 // 	SceNpAuthorizationCode authCode;
 // 	memset(&authCode, 0x0, sizeof(authCode));
- 
+
 	SceNpAuthGetAuthorizationCodeParameter authParams;
-	memset(&authParams, 0x0, sizeof(authParams));	
+	memset(&authParams, 0x0, sizeof(authParams));
 
 	authParams.size = sizeof(authParams);
-	authParams.pScope = AUTH_SCOPE;	
+	authParams.pScope = AUTH_SCOPE;
 
 	memcpy(clientId.id, CLIENT_ID, strlen(CLIENT_ID));
-	authParams.pClientId = &clientId;	
+	authParams.pClientId = &clientId;
 
 	int issuerId = 0;
 // 	ret = sceNpAuthGetAuthorizationCode(reqId, &authParams, &authCode, &issuerId);
-// 	if (ret < 0) 
+// 	if (ret < 0)
 // 	{
 // 		app.DebugPrintf("Failed to get auth code 0x%x\n", ret);
 // 		sceNpAuthDeleteOAuthRequest(reqId);
@@ -195,7 +195,7 @@ bool SonyRemoteStorage_Vita::init(CallbackFunc cb, LPVOID lpParam)
 // 	}
 
 	ret = sceNpAuthDeleteOAuthRequest(reqId);
-	if (ret < 0) 
+	if (ret < 0)
 	{
 		app.DebugPrintf("Couldn't delete auth request 0x%x\n", ret);
 		return false;
@@ -221,11 +221,11 @@ bool SonyRemoteStorage_Vita::init(CallbackFunc cb, LPVOID lpParam)
 	SceRemoteStorageAbortReqParams abortParams;
 
 	ret = sceRemoteStorageInit(params);
-	if(ret >= 0) 
+	if(ret >= 0)
 	{
 		abortParams.requestId = ret;
 		app.DebugPrintf("Session will be created \n");
-	} 
+	}
 	else if(ret == SCE_REMOTE_STORAGE_ERROR_ALREADY_INITIALISED)
 	{
 		app.DebugPrintf("Session already created \n");
@@ -251,12 +251,12 @@ bool SonyRemoteStorage_Vita::getRemoteFileInfo(SceRemoteStorageStatus* pInfo, Ca
 	reqId = sceRemoteStorageGetStatus(params, outputGetStatus);
 	m_status = e_getStatusInProgress;
 
-	if(reqId >= 0) 
+	if(reqId >= 0)
 	{
 		app.DebugPrintf("Get Status request sent \n");
 		return true;
-	} 
-	else 
+	}
+	else
 	{
 		app.DebugPrintf("Error sending Get Status request: 0x%x \n", reqId);
 		return false;
@@ -275,11 +275,11 @@ void SonyRemoteStorage_Vita::abort()
 		params.requestId = reqId;
 		int ret = sceRemoteStorageAbort(params);
 
-		if(ret >= 0) 
+		if(ret >= 0)
 		{
 			app.DebugPrintf("Abort request done \n");
-		} 
-		else 
+		}
+		else
 		{
 			app.DebugPrintf("Error in Abort request: 0x%x \n", ret);
 		}
@@ -317,7 +317,7 @@ bool SonyRemoteStorage_Vita::setDataInternal()
 		char seed[22];
 		app.GetImageTextData(m_thumbnailData, m_thumbnailDataSize,(unsigned char *)seed, uiHostOptions, bHostOptionsRead, uiTexturePack);
 
-		__int64 iSeed = strtoll(seed,NULL,10);
+		int64_t iSeed = strtoll(seed,NULL,10);
 		char seedHex[17];
 		sprintf(seedHex,"%016llx",iSeed);
 		memcpy(descData.m_seed,seedHex,16); // Don't copy null
@@ -345,13 +345,13 @@ bool SonyRemoteStorage_Vita::setDataInternal()
 	reqId = sceRemoteStorageSetData(params);
 
 	app.DebugPrintf("\n*******************************\n");
-	if(reqId >= 0) 
+	if(reqId >= 0)
 	{
 		app.DebugPrintf("Set Data request sent \n");
 		m_bTransferStarted = true;
 		return true;
-	} 
-	else 
+	}
+	else
 	{
 		app.DebugPrintf("Error sending Set Data request: 0x%x \n", reqId);
 		return false;
@@ -374,13 +374,13 @@ bool SonyRemoteStorage_Vita::getData( const char* remotePath, const char* localP
 	reqId = sceRemoteStorageGetData(params, &s_getDataOutput);
 
 	app.DebugPrintf("\n*******************************\n");
-	if(reqId >= 0) 
+	if(reqId >= 0)
 	{
 		app.DebugPrintf("Get Data request sent \n");
 		m_bTransferStarted = true;
 		return true;
-	} 
-	else 
+	}
+	else
 	{
 		app.DebugPrintf("Error sending Get Data request: 0x%x \n", reqId);
 		return false;

Minecraft.Client/PSVita/PSVitaExtras/PSVitaStubs.h

@@ -26,7 +26,7 @@ DWORD TlsAlloc(VOID);
 LPVOID TlsGetValue(DWORD dwTlsIndex);
 BOOL TlsSetValue(DWORD dwTlsIndex, LPVOID lpTlsValue);
 
-typedef struct _RECT 
+typedef struct _RECT
 {
 	LONG left;
 	LONG top;
@@ -34,13 +34,13 @@ typedef struct _RECT
 	LONG bottom;
 } RECT, *PRECT;
 
-typedef struct _TOUCHSCREENRECT 
+typedef struct _TOUCHSCREENRECT
 {
 	SceInt16 left;
 	SceInt16 top;
 	SceInt16 right;
 	SceInt16 bottom;
-} 
+}
 TOUCHSCREENRECT, *PTOUCHSCREENRECT;
 
 typedef void ID3D11Device;
@@ -58,16 +58,16 @@ typedef int errno_t;
 // 	//  The following field is used for blocking when there is contention for
 // 	//  the resource
 // 	//
-// 
+//
 // 	union {
 // 		ULONG_PTR RawEvent[4];
 // 	} Synchronization;
-// 
+//
 // 	//
 // 	//  The following three fields control entering and exiting the critical
 // 	//  section for the resource
 // 	//
-// 
+//
 // 	LONG LockCount;
 // 	LONG RecursionCount;
 // 	HANDLE OwningThread;
@@ -261,7 +261,7 @@ typedef struct _MEMORYSTATUS {
 #define THREAD_PRIORITY_IDLE            THREAD_BASE_PRIORITY_IDLE
 
 #define WAIT_TIMEOUT                     258L
-#define STATUS_ABANDONED_WAIT_0          ((DWORD   )0x00000080L)    
+#define STATUS_ABANDONED_WAIT_0          ((DWORD   )0x00000080L)
 #define WAIT_ABANDONED         ((STATUS_ABANDONED_WAIT_0 ) + 0 )
 
 #define MAXUINT_PTR  (~((UINT_PTR)0))
@@ -303,17 +303,17 @@ typedef struct _MEMORYSTATUS {
 #define GENERIC_EXECUTE                  (0x20000000L)
 #define GENERIC_ALL                      (0x10000000L)
 
-#define FILE_SHARE_READ                 0x00000001  
-#define FILE_SHARE_WRITE                0x00000002  
-#define FILE_SHARE_DELETE               0x00000004  
-#define FILE_ATTRIBUTE_READONLY             0x00000001  
-#define FILE_ATTRIBUTE_HIDDEN               0x00000002  
-#define FILE_ATTRIBUTE_SYSTEM               0x00000004  
-#define FILE_ATTRIBUTE_DIRECTORY            0x00000010  
-#define FILE_ATTRIBUTE_ARCHIVE              0x00000020  
-#define FILE_ATTRIBUTE_DEVICE               0x00000040  
-#define FILE_ATTRIBUTE_NORMAL               0x00000080  
-#define FILE_ATTRIBUTE_TEMPORARY            0x00000100  
+#define FILE_SHARE_READ                 0x00000001
+#define FILE_SHARE_WRITE                0x00000002
+#define FILE_SHARE_DELETE               0x00000004
+#define FILE_ATTRIBUTE_READONLY             0x00000001
+#define FILE_ATTRIBUTE_HIDDEN               0x00000002
+#define FILE_ATTRIBUTE_SYSTEM               0x00000004
+#define FILE_ATTRIBUTE_DIRECTORY            0x00000010
+#define FILE_ATTRIBUTE_ARCHIVE              0x00000020
+#define FILE_ATTRIBUTE_DEVICE               0x00000040
+#define FILE_ATTRIBUTE_NORMAL               0x00000080
+#define FILE_ATTRIBUTE_TEMPORARY            0x00000100
 
 #define FILE_FLAG_WRITE_THROUGH         0x80000000
 #define FILE_FLAG_OVERLAPPED            0x40000000
@@ -333,38 +333,38 @@ typedef struct _MEMORYSTATUS {
 #define OPEN_ALWAYS         4
 #define TRUNCATE_EXISTING   5
 
-#define PAGE_NOACCESS          0x01     
-#define PAGE_READONLY          0x02     
-#define PAGE_READWRITE         0x04     
-#define PAGE_WRITECOPY         0x08     
-#define PAGE_EXECUTE           0x10     
-#define PAGE_EXECUTE_READ      0x20     
-#define PAGE_EXECUTE_READWRITE 0x40     
-#define PAGE_EXECUTE_WRITECOPY 0x80     
-#define PAGE_GUARD            0x100     
-#define PAGE_NOCACHE          0x200     
-#define PAGE_WRITECOMBINE     0x400     
-#define PAGE_USER_READONLY   0x1000     
-#define PAGE_USER_READWRITE  0x2000     
-#define MEM_COMMIT           0x1000     
-#define MEM_RESERVE          0x2000     
-#define MEM_DECOMMIT         0x4000     
-#define MEM_RELEASE          0x8000     
-#define MEM_FREE            0x10000     
-#define MEM_PRIVATE         0x20000     
-#define MEM_RESET           0x80000     
-#define MEM_TOP_DOWN       0x100000     
-#define MEM_NOZERO         0x800000     
-#define MEM_LARGE_PAGES  0x20000000     
-#define MEM_HEAP         0x40000000     
-#define MEM_16MB_PAGES   0x80000000     
+#define PAGE_NOACCESS          0x01
+#define PAGE_READONLY          0x02
+#define PAGE_READWRITE         0x04
+#define PAGE_WRITECOPY         0x08
+#define PAGE_EXECUTE           0x10
+#define PAGE_EXECUTE_READ      0x20
+#define PAGE_EXECUTE_READWRITE 0x40
+#define PAGE_EXECUTE_WRITECOPY 0x80
+#define PAGE_GUARD            0x100
+#define PAGE_NOCACHE          0x200
+#define PAGE_WRITECOMBINE     0x400
+#define PAGE_USER_READONLY   0x1000
+#define PAGE_USER_READWRITE  0x2000
+#define MEM_COMMIT           0x1000
+#define MEM_RESERVE          0x2000
+#define MEM_DECOMMIT         0x4000
+#define MEM_RELEASE          0x8000
+#define MEM_FREE            0x10000
+#define MEM_PRIVATE         0x20000
+#define MEM_RESET           0x80000
+#define MEM_TOP_DOWN       0x100000
+#define MEM_NOZERO         0x800000
+#define MEM_LARGE_PAGES  0x20000000
+#define MEM_HEAP         0x40000000
+#define MEM_16MB_PAGES   0x80000000
 
 #define IGNORE              0       // Ignore signal
 #define INFINITE            0xFFFFFFFF  // Infinite timeout
 #define WAIT_FAILED ((DWORD)0xFFFFFFFF)
-#define STATUS_WAIT_0                    ((DWORD   )0x00000000L)    
+#define STATUS_WAIT_0                    ((DWORD   )0x00000000L)
 #define WAIT_OBJECT_0       ((STATUS_WAIT_0 ) + 0 )
-#define STATUS_PENDING                   ((DWORD   )0x00000103L)    
+#define STATUS_PENDING                   ((DWORD   )0x00000103L)
 #define STILL_ACTIVE                        STATUS_PENDING
 
 DWORD GetLastError(VOID);
@@ -403,9 +403,9 @@ VOID OutputDebugString(LPCSTR lpOutputString);
 VOID OutputDebugStringA(LPCSTR lpOutputString);
 
 errno_t _itoa_s(int _Value, char * _DstBuf, size_t _Size, int _Radix);
-errno_t _i64toa_s(__int64 _Val, char * _DstBuf, size_t _Size, int _Radix);
+errno_t _i64toa_s(int64_t _Val, char * _DstBuf, size_t _Size, int _Radix);
 
-#define __declspec(a) 
+#define __declspec(a)
 extern "C" int _wcsicmp (const wchar_t * dst, const wchar_t * src);
 
 size_t wcsnlen(const wchar_t *wcs, size_t maxsize);

Minecraft.Client/PSVita/PSVitaExtras/PSVitaTypes.h

@@ -34,14 +34,12 @@ typedef unsigned int        *PUINT;
 
 
 typedef unsigned char		byte;
-typedef long long 			__int64;
-typedef unsigned long long	__uint64;
 typedef unsigned int		DWORD;
 typedef int                 INT;
 typedef unsigned long		ULONG_PTR, *PULONG_PTR;
 typedef ULONG_PTR SIZE_T, *PSIZE_T;
 
-typedef __int64 LONG64, *PLONG64;
+typedef int64_t LONG64, *PLONG64;
 
 #define VOID void
 typedef char CHAR;

Minecraft.Client/PSVita/PSVitaExtras/PsVitaStubs.cpp

@@ -56,42 +56,42 @@ void PSVitaInit()
 	int err = sceFiosInitialize(&params);
 	assert(err == SCE_FIOS_OK);
 }
-char* getConsoleHomePath() 
-{ 
-	return contentInfoPath; 
+char* getConsoleHomePath()
+{
+	return contentInfoPath;
 }
 
-char* getUsrDirRoot() 
-{ 
-	return driveRoot; 
+char* getUsrDirRoot()
+{
+	return driveRoot;
 }
 
-char* getUsrDirPath() 
-{ 
-	return usrdirPath; 
+char* getUsrDirPath()
+{
+	return usrdirPath;
 }
 
-char* getConsoleHomePathBDPatch() 
-{ 
-	return contentInfoPathBDPatch; 
+char* getConsoleHomePathBDPatch()
+{
+	return contentInfoPathBDPatch;
 }
 
-char* getUsrDirPathBDPatch() 
-{ 
-	return usrdirPathBDPatch; 
+char* getUsrDirPathBDPatch()
+{
+	return usrdirPathBDPatch;
 }
 
 
-char* getDirName() 
-{ 
-	return dirName; 
+char* getDirName()
+{
+	return dirName;
 }
 
 int _wcsicmp( const wchar_t * dst, const wchar_t * src )
 {
 	wchar_t f,l;
 
-	// validation section 
+	// validation section
 	// 	_VALIDATE_RETURN(dst != NULL, EINVAL, _NLSCMPERROR);
 	// 	_VALIDATE_RETURN(src != NULL, EINVAL, _NLSCMPERROR);
 
@@ -117,7 +117,7 @@ size_t wcsnlen(const wchar_t *wcs, size_t maxsize)
 	return n;
 }
 
-VOID GetSystemTime(	LPSYSTEMTIME lpSystemTime) 
+VOID GetSystemTime(	LPSYSTEMTIME lpSystemTime)
 {
 	SceDateTime dateTime;
 	int err = sceRtcGetCurrentClock(&dateTime, 0);
@@ -133,8 +133,8 @@ VOID GetSystemTime(	LPSYSTEMTIME lpSystemTime)
 	lpSystemTime->wMilliseconds = sceRtcGetMicrosecond(&dateTime)/1000;
 }
 BOOL FileTimeToSystemTime(CONST FILETIME *lpFileTime, LPSYSTEMTIME lpSystemTime) { PSVITA_STUBBED; return false; }
-BOOL SystemTimeToFileTime(CONST SYSTEMTIME *lpSystemTime, LPFILETIME lpFileTime) 
-{ 
+BOOL SystemTimeToFileTime(CONST SYSTEMTIME *lpSystemTime, LPFILETIME lpFileTime)
+{
 	SceUInt64 diffHundredNanos;
 	SceDateTime dateTime;
 	int err = sceRtcGetCurrentClock(&dateTime, 0);
@@ -143,11 +143,11 @@ BOOL SystemTimeToFileTime(CONST SYSTEMTIME *lpSystemTime, LPFILETIME lpFileTime)
 
 	lpFileTime->dwHighDateTime = diffHundredNanos >> 32;
 	lpFileTime->dwLowDateTime = diffHundredNanos & 0xffffffff;
-	return true; 
+	return true;
 }
 
-VOID GetLocalTime(LPSYSTEMTIME lpSystemTime) 
-{ 
+VOID GetLocalTime(LPSYSTEMTIME lpSystemTime)
+{
 	SceDateTime dateTime;
 	int err = sceRtcGetCurrentClockLocalTime(&dateTime);
 	assert(err == SCE_OK);
@@ -163,26 +163,26 @@ VOID GetLocalTime(LPSYSTEMTIME lpSystemTime)
 }
 
 HANDLE CreateEvent(void* lpEventAttributes,	BOOL bManualReset,	BOOL bInitialState,	LPCSTR lpName) { PSVITA_STUBBED; return NULL; }
-VOID Sleep(DWORD dwMilliseconds) 
-{ 
+VOID Sleep(DWORD dwMilliseconds)
+{
 	C4JThread::Sleep(dwMilliseconds);
 }
 
 BOOL SetThreadPriority(HANDLE hThread, int nPriority) { PSVITA_STUBBED; return FALSE; }
 DWORD WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds) { PSVITA_STUBBED; return false; }
 
-LONG InterlockedCompareExchangeRelease(LONG volatile *Destination, LONG Exchange,LONG Comperand	) 
-{ 
+LONG InterlockedCompareExchangeRelease(LONG volatile *Destination, LONG Exchange,LONG Comperand	)
+{
 	return sceAtomicCompareAndSwap32((int32_t*)Destination, (int32_t)Comperand, (int32_t)Exchange);
 }
 
-LONG64 InterlockedCompareExchangeRelease64(LONG64 volatile *Destination, LONG64 Exchange, LONG64 Comperand) 
-{ 
+LONG64 InterlockedCompareExchangeRelease64(LONG64 volatile *Destination, LONG64 Exchange, LONG64 Comperand)
+{
 	return sceAtomicCompareAndSwap64((int64_t*)Destination, (int64_t)Comperand, (int64_t)Exchange);
 }
 
 
-VOID InitializeCriticalSection(PCRITICAL_SECTION CriticalSection) 
+VOID InitializeCriticalSection(PCRITICAL_SECTION CriticalSection)
 {
 	char name[1] = {0};
 
@@ -191,7 +191,7 @@ VOID InitializeCriticalSection(PCRITICAL_SECTION CriticalSection)
 }
 
 
-VOID InitializeCriticalSectionAndSpinCount(PCRITICAL_SECTION CriticalSection, ULONG SpinCount) 
+VOID InitializeCriticalSectionAndSpinCount(PCRITICAL_SECTION CriticalSection, ULONG SpinCount)
 {
 	// no spin count on PSVita
 	InitializeCriticalSection(CriticalSection);
@@ -203,16 +203,16 @@ VOID DeleteCriticalSection(PCRITICAL_SECTION CriticalSection)
 	PSVITA_ASSERT_SCE_ERROR(err);
 }
 
-extern CRITICAL_SECTION g_singleThreadCS; 
+extern CRITICAL_SECTION g_singleThreadCS;
 
-VOID EnterCriticalSection(PCRITICAL_SECTION CriticalSection) 
+VOID EnterCriticalSection(PCRITICAL_SECTION CriticalSection)
 {
 	int err = sceKernelLockLwMutex ((SceKernelLwMutexWork *)(&CriticalSection->mutex), 1, NULL);
 	PSVITA_ASSERT_SCE_ERROR(err);
 }
 
 
-VOID LeaveCriticalSection(PCRITICAL_SECTION CriticalSection) 
+VOID LeaveCriticalSection(PCRITICAL_SECTION CriticalSection)
 {
 	int err =  sceKernelUnlockLwMutex ((SceKernelLwMutexWork *)(&CriticalSection->mutex), 1);
 	PSVITA_ASSERT_SCE_ERROR(err);
@@ -272,8 +272,8 @@ VOID LeaveCriticalRWSection(PCRITICAL_RW_SECTION CriticalSection, bool Write)
 
 
 
-BOOL CloseHandle(HANDLE hObject) 
-{ 
+BOOL CloseHandle(HANDLE hObject)
+{
 	sceFiosFHCloseSync(NULL,(SceFiosFH)((int32_t)hObject));
 	return true;
 }
@@ -292,8 +292,8 @@ BOOL TlsSetValue(DWORD dwTlsIndex, LPVOID lpTlsValue) { return PSVitaTLSStorage:
 static void* VirtualAllocs[1000];	// a list of 1MB allocations
 static int VirtualNumAllocs = 0;	// how many 1MB chunks have been allocated
 
-LPVOID VirtualAlloc(LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect) 
-{ 
+LPVOID VirtualAlloc(LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect)
+{
 	if( flAllocationType == MEM_COMMIT )
 	{
 		// how many pages do we need
@@ -318,7 +318,7 @@ LPVOID VirtualAlloc(LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWO
 	return (void*) VIRTUAL_OFFSET;
 }
 
-BOOL VirtualFree(LPVOID lpAddress, SIZE_T dwSize, DWORD dwFreeType) 
+BOOL VirtualFree(LPVOID lpAddress, SIZE_T dwSize, DWORD dwFreeType)
 {
 	while( VirtualNumAllocs )
 	{
@@ -332,7 +332,7 @@ BOOL VirtualFree(LPVOID lpAddress, SIZE_T dwSize, DWORD dwFreeType)
 
 
 // memset a section of the virtual chunks
-VOID VirtualMemset(LPVOID lpDestOffset, int val, SIZE_T dwSize) 
+VOID VirtualMemset(LPVOID lpDestOffset, int val, SIZE_T dwSize)
 {
 	int DestOffset = ((int)(lpDestOffset) - VIRTUAL_OFFSET);	// convert the pointer back into a virtual offset
 	int StartPage = DestOffset / VIRTUAL_PAGE_SIZE;				// which 1MB page do we start on
@@ -370,7 +370,7 @@ VOID VirtualMemset(LPVOID lpDestOffset, int val, SIZE_T dwSize)
 
 
 // copy a block of memory to the virtual chunks
-VOID VirtualCopyTo(LPVOID lpDestOffset, LPVOID lpSrc, SIZE_T dwSize) 
+VOID VirtualCopyTo(LPVOID lpDestOffset, LPVOID lpSrc, SIZE_T dwSize)
 {
 	int DestOffset = ((int)(lpDestOffset) - VIRTUAL_OFFSET);	// convert the pointer back into a virtual offset
 	int StartPage = DestOffset / VIRTUAL_PAGE_SIZE;				// which 1MB page do we start on
@@ -409,7 +409,7 @@ VOID VirtualCopyTo(LPVOID lpDestOffset, LPVOID lpSrc, SIZE_T dwSize)
 }
 
 // copy a block of memory from the virtual chunks
-VOID VirtualCopyFrom(LPVOID lpDest, LPVOID lpSrcOffset, SIZE_T dwSize) 
+VOID VirtualCopyFrom(LPVOID lpDest, LPVOID lpSrcOffset, SIZE_T dwSize)
 {
 	int SrcOffset = ((int)(lpSrcOffset) - VIRTUAL_OFFSET);	// convert the pointer back into a virtual offset
 	int StartPage = SrcOffset / VIRTUAL_PAGE_SIZE;			// which 1MB page do we start on
@@ -448,7 +448,7 @@ VOID VirtualCopyFrom(LPVOID lpDest, LPVOID lpSrcOffset, SIZE_T dwSize)
 }
 
 // copy a block of memory between the virtual chunks
-VOID VirtualMove(LPVOID lpDestOffset, LPVOID lpSrcOffset, SIZE_T dwSize) 
+VOID VirtualMove(LPVOID lpDestOffset, LPVOID lpSrcOffset, SIZE_T dwSize)
 {
 	int DestOffset = ((int)(lpDestOffset) - VIRTUAL_OFFSET);	// convert the pointer back into a virtual offset
 	int DestChunkOffset = DestOffset % VIRTUAL_PAGE_SIZE;		// what is the byte offset within the current 1MB page
@@ -651,7 +651,7 @@ DWORD GetFileSize( HANDLE hFile, LPDWORD lpFileSizeHigh	)
 {
 	SceFiosFH fh = (SceFiosFH)(hFile);
 
-	// 4J Stu - sceFiosFHGetSize didn't seem to work...so doing this for now	
+	// 4J Stu - sceFiosFHGetSize didn't seem to work...so doing this for now
 	//SceFiosSize FileSize;
 	//FileSize=sceFiosFHGetSize(fh);
 	SceFiosStat statData;
@@ -693,7 +693,7 @@ BOOL WriteFile(	HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPD
 	return FALSE;
 }
 
-BOOL ReadFile(HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped ) 
+BOOL ReadFile(HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped )
 {
 	SceFiosFH fh = (SceFiosFH)((int64_t)hFile);
 	// sceFiosFHReadSync - Non-negative values are the number of bytes read, 0 <= result <= length. Negative values are error codes.
@@ -742,7 +742,7 @@ void replaceBackslashes(char* szFilename)
 	}
 }
 
-HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile) 
+HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile)
 {
 	char filePath[256];
 	std::string mountedPath = StorageManager.GetMountedPath(lpFileName);
@@ -767,7 +767,7 @@ HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
 #ifndef _CONTENT_PACKAGE
 	printf("*** Opening %s\n",filePath);
 #endif
-	
+
 	SceFiosFH fh;
 	int err = sceFiosFHOpenSync(NULL, &fh, filePath, NULL);
 	assert( err == SCE_FIOS_OK );
@@ -775,8 +775,8 @@ HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
 	return (void*)fh;
 }
 
-BOOL CreateDirectoryA(LPCSTR lpPathName, LPSECURITY_ATTRIBUTES lpSecurityAttributes) 
-{ 
+BOOL CreateDirectoryA(LPCSTR lpPathName, LPSECURITY_ATTRIBUTES lpSecurityAttributes)
+{
 #ifndef _CONTENT_PACKAGE
 	char filePath[256];
 	sprintf(filePath,"%s/%s",usrdirPath, lpPathName );
@@ -793,12 +793,12 @@ BOOL CreateDirectoryA(LPCSTR lpPathName, LPSECURITY_ATTRIBUTES lpSecurityAttribu
 
 BOOL DeleteFileA(LPCSTR lpFileName) { PSVITA_STUBBED; return false; }
 
-// BOOL XCloseHandle(HANDLE a) 
-// { 
-// 	cellFsClose(int(a)); 
+// BOOL XCloseHandle(HANDLE a)
+// {
+// 	cellFsClose(int(a));
 // }
 
-DWORD GetFileAttributesA(LPCSTR lpFileName) 
+DWORD GetFileAttributesA(LPCSTR lpFileName)
 {
 	char filePath[256];
 	std::string mountedPath = StorageManager.GetMountedPath(lpFileName);
@@ -834,7 +834,7 @@ VOID DebugBreak(VOID) { SCE_BREAK(); }
 
 
 DWORD GetLastError(VOID) { PSVITA_STUBBED; return 0; }
-VOID GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer) 
+VOID GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer)
 {
 	PSVITA_STUBBED;
 	/*	malloc_managed_size stat;
@@ -849,9 +849,9 @@ VOID GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer)
 	lpBuffer->dwAvailVirtual = stat.max_system_size - stat.current_inuse_size;*/
 }
 
-DWORD GetTickCount() 
+DWORD GetTickCount()
 {
-	// This function returns the current system time at this function is called. 
+	// This function returns the current system time at this function is called.
 	// The system time is represented the time elapsed since the system starts up in microseconds.
 
 	uint64_t sysTime = sceKernelGetProcessTimeWide();
@@ -860,11 +860,11 @@ DWORD GetTickCount()
 }
 
 // we should really use libperf for this kind of thing, but this will do for now.
-BOOL QueryPerformanceFrequency(LARGE_INTEGER *lpFrequency) 
-{ 
+BOOL QueryPerformanceFrequency(LARGE_INTEGER *lpFrequency)
+{
 	// microseconds
-	lpFrequency->QuadPart =  (1000 * 1000);		
-	return false; 
+	lpFrequency->QuadPart =  (1000 * 1000);
+	return false;
 }
 BOOL QueryPerformanceCounter(LARGE_INTEGER *lpPerformanceCount)
 {
@@ -874,24 +874,24 @@ BOOL QueryPerformanceCounter(LARGE_INTEGER *lpPerformanceCount)
 }
 
 #ifndef _FINAL_BUILD
-VOID OutputDebugStringW(LPCWSTR lpOutputString) 
-{ 
-	wprintf(lpOutputString); 
+VOID OutputDebugStringW(LPCWSTR lpOutputString)
+{
+	wprintf(lpOutputString);
 }
 
-VOID OutputDebugString(LPCSTR lpOutputString) 
-{ 
-	printf(lpOutputString); 
+VOID OutputDebugString(LPCSTR lpOutputString)
+{
+	printf(lpOutputString);
 }
 
-VOID OutputDebugStringA(LPCSTR lpOutputString) 
-{ 
-	printf(lpOutputString); 
+VOID OutputDebugStringA(LPCSTR lpOutputString)
+{
+	printf(lpOutputString);
 }
 #endif // _CONTENT_PACKAGE
 
 BOOL GetFileAttributesExA(LPCSTR lpFileName,GET_FILEEX_INFO_LEVELS fInfoLevelId,LPVOID lpFileInformation)
-{ 
+{
 	WIN32_FILE_ATTRIBUTE_DATA *fileInfoBuffer = (WIN32_FILE_ATTRIBUTE_DATA*) lpFileInformation;
 
 	char filePath[256];
@@ -920,32 +920,32 @@ BOOL GetFileAttributesExA(LPCSTR lpFileName,GET_FILEEX_INFO_LEVELS fInfoLevelId,
 }
 
 HANDLE FindFirstFileA(LPCSTR lpFileName, LPWIN32_FIND_DATA lpFindFileData)
-{ 
-	PSVITA_STUBBED; 
+{
+	PSVITA_STUBBED;
 	return 0;
 }
 
-BOOL FindNextFileA(HANDLE hFindFile, LPWIN32_FIND_DATAA lpFindFileData) 
-{ 
+BOOL FindNextFileA(HANDLE hFindFile, LPWIN32_FIND_DATAA lpFindFileData)
+{
 	PSVITA_STUBBED;
 	return false;
 }
 
 errno_t _itoa_s(int _Value, char * _DstBuf, size_t _Size, int _Radix) { if(_Radix==10) sprintf(_DstBuf,"%d",_Value); else if(_Radix==16) sprintf(_DstBuf,"%lx",_Value); else return -1; return 0; }
-errno_t _i64toa_s(__int64 _Val, char * _DstBuf, size_t _Size, int _Radix) { if(_Radix==10) sprintf(_DstBuf,"%lld",_Val); else return -1; return 0; }
+errno_t _i64toa_s(int64_t _Val, char * _DstBuf, size_t _Size, int _Radix) { if(_Radix==10) sprintf(_DstBuf,"%lld",_Val); else return -1; return 0; }
 
 int _wtoi(const wchar_t *_Str)
 {
 	return wcstol(_Str, NULL, 10);
 }
 
-DWORD XGetLanguage() 
-{ 
+DWORD XGetLanguage()
+{
 	unsigned char ucLang = app.GetMinecraftLanguage(0);
 	SceInt32 iLang;
 
 	// check if we should override the system language or not
-	if(ucLang==MINECRAFT_LANGUAGE_DEFAULT)	
+	if(ucLang==MINECRAFT_LANGUAGE_DEFAULT)
 	{
 		sceAppUtilSystemParamGetInt(SCE_SYSTEM_PARAM_ID_LANG,&iLang);
 	}
@@ -960,7 +960,7 @@ DWORD XGetLanguage()
 	case SCE_SYSTEM_PARAM_LANG_ENGLISH_US		: return XC_LANGUAGE_ENGLISH;
 	case SCE_SYSTEM_PARAM_LANG_FRENCH			: return XC_LANGUAGE_FRENCH;
 
-	case SCE_SYSTEM_PARAM_LANG_SPANISH			: 
+	case SCE_SYSTEM_PARAM_LANG_SPANISH			:
 		if(app.IsAmericanSKU())
 		{
 			return XC_LANGUAGE_LATINAMERICANSPANISH;
@@ -995,8 +995,8 @@ DWORD XGetLanguage()
 	}
 
 }
-DWORD XGetLocale() 
-{ 
+DWORD XGetLocale()
+{
 	SceInt32 iLang;
 	sceAppUtilSystemParamGetInt(SCE_SYSTEM_PARAM_ID_LANG,&iLang);
 	switch(iLang)
@@ -1005,7 +1005,7 @@ DWORD XGetLocale()
 	case SCE_SYSTEM_PARAM_LANG_ENGLISH_US		: return XC_LOCALE_UNITED_STATES;
 	case SCE_SYSTEM_PARAM_LANG_FRENCH			: return XC_LOCALE_FRANCE;
 
-	case SCE_SYSTEM_PARAM_LANG_SPANISH			: 
+	case SCE_SYSTEM_PARAM_LANG_SPANISH			:
 		if(app.IsAmericanSKU())
 		{
 			return XC_LOCALE_LATIN_AMERICA;
@@ -1039,7 +1039,7 @@ DWORD XGetLocale()
 	}
 }
 
-DWORD XEnableGuestSignin(BOOL fEnable) 
-{ 
-	return 0; 
+DWORD XEnableGuestSignin(BOOL fEnable)
+{
+	return 0;
 }

Minecraft.Client/PSVita/PSVitaExtras/libdivide.h

@@ -29,8 +29,8 @@
 #if ! LIBDIVIDE_HAS_STDINT_TYPES
 typedef __int32 int32_t;
 typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
+typedef int64_t int64_t;
+typedef uint64_t uint64_t;
 typedef __int8 int8_t;
 typedef unsigned __int8 uint8_t;
 #endif
@@ -83,7 +83,7 @@ u32: [0-4] shift value
      [5] ignored
      [6] add indicator
      [7] shift path
-     
+
 s32: [0-4] shift value
      [5] shift path
      [6] add indicator
@@ -106,7 +106,7 @@ enum {
     LIBDIVIDE_U32_SHIFT_PATH = 0x80,
     LIBDIVIDE_U64_SHIFT_PATH = 0x80,
     LIBDIVIDE_S32_SHIFT_PATH = 0x20,
-    LIBDIVIDE_NEGATIVE_DIVISOR = 0x80    
+    LIBDIVIDE_NEGATIVE_DIVISOR = 0x80
 };
 
 
@@ -123,7 +123,7 @@ struct libdivide_s32_t {
 struct libdivide_u64_t {
     uint64_t magic;
     uint8_t more;
-};    
+};
 
 struct libdivide_s64_t {
     int64_t magic;
@@ -146,7 +146,7 @@ LIBDIVIDE_API struct libdivide_s32_t libdivide_s32_gen(int32_t y);
 LIBDIVIDE_API struct libdivide_u32_t libdivide_u32_gen(uint32_t y);
 LIBDIVIDE_API struct libdivide_s64_t libdivide_s64_gen(int64_t y);
 LIBDIVIDE_API struct libdivide_u64_t libdivide_u64_gen(uint64_t y);
- 
+
 LIBDIVIDE_API int32_t  libdivide_s32_do(int32_t numer, const struct libdivide_s32_t *denom);
 LIBDIVIDE_API uint32_t libdivide_u32_do(uint32_t numer, const struct libdivide_u32_t *denom);
 LIBDIVIDE_API int64_t  libdivide_s64_do(int64_t numer, const struct libdivide_s64_t *denom);
@@ -156,19 +156,19 @@ LIBDIVIDE_API int libdivide_u32_get_algorithm(const struct libdivide_u32_t *deno
 LIBDIVIDE_API uint32_t libdivide_u32_do_alg0(uint32_t numer, const struct libdivide_u32_t *denom);
 LIBDIVIDE_API uint32_t libdivide_u32_do_alg1(uint32_t numer, const struct libdivide_u32_t *denom);
 LIBDIVIDE_API uint32_t libdivide_u32_do_alg2(uint32_t numer, const struct libdivide_u32_t *denom);
- 
+
 LIBDIVIDE_API int libdivide_u64_get_algorithm(const struct libdivide_u64_t *denom);
 LIBDIVIDE_API uint64_t libdivide_u64_do_alg0(uint64_t numer, const struct libdivide_u64_t *denom);
 LIBDIVIDE_API uint64_t libdivide_u64_do_alg1(uint64_t numer, const struct libdivide_u64_t *denom);
 LIBDIVIDE_API uint64_t libdivide_u64_do_alg2(uint64_t numer, const struct libdivide_u64_t *denom);
- 
+
 LIBDIVIDE_API int libdivide_s32_get_algorithm(const struct libdivide_s32_t *denom);
 LIBDIVIDE_API int32_t libdivide_s32_do_alg0(int32_t numer, const struct libdivide_s32_t *denom);
 LIBDIVIDE_API int32_t libdivide_s32_do_alg1(int32_t numer, const struct libdivide_s32_t *denom);
 LIBDIVIDE_API int32_t libdivide_s32_do_alg2(int32_t numer, const struct libdivide_s32_t *denom);
 LIBDIVIDE_API int32_t libdivide_s32_do_alg3(int32_t numer, const struct libdivide_s32_t *denom);
 LIBDIVIDE_API int32_t libdivide_s32_do_alg4(int32_t numer, const struct libdivide_s32_t *denom);
- 
+
 LIBDIVIDE_API int libdivide_s64_get_algorithm(const struct libdivide_s64_t *denom);
 LIBDIVIDE_API int64_t libdivide_s64_do_alg0(int64_t numer, const struct libdivide_s64_t *denom);
 LIBDIVIDE_API int64_t libdivide_s64_do_alg1(int64_t numer, const struct libdivide_s64_t *denom);
@@ -202,17 +202,17 @@ LIBDIVIDE_API __m128i libdivide_s64_do_vector_alg2(__m128i numers, const struct
 LIBDIVIDE_API __m128i libdivide_s64_do_vector_alg3(__m128i numers, const struct libdivide_s64_t * denom);
 LIBDIVIDE_API __m128i libdivide_s64_do_vector_alg4(__m128i numers, const struct libdivide_s64_t * denom);
 #endif
- 
- 
- 
+
+
+
 //////// Internal Utility Functions
- 
+
 static inline uint32_t libdivide__mullhi_u32(uint32_t x, uint32_t y) {
     uint64_t xl = x, yl = y;
     uint64_t rl = xl * yl;
     return (uint32_t)(rl >> 32);
 }
- 
+
 static uint64_t libdivide__mullhi_u64(uint64_t x, uint64_t y) {
 #if HAS_INT128_T
     __uint128_t xl = x, yl = y;
@@ -227,18 +227,18 @@ static uint64_t libdivide__mullhi_u64(uint64_t x, uint64_t y) {
     const uint64_t x0y1 = x0 * (uint64_t)y1;
     const uint64_t x1y0 = x1 * (uint64_t)y0;
     const uint64_t x1y1 = x1 * (uint64_t)y1;
-    
+
     uint64_t temp = x1y0 + x0y0_hi;
     uint64_t temp_lo = temp & mask, temp_hi = temp >> 32;
     return x1y1 + temp_hi + ((temp_lo + x0y1) >> 32);
 #endif
 }
- 
+
 static inline int64_t libdivide__mullhi_s64(int64_t x, int64_t y) {
 #if HAS_INT128_T
     __int128_t xl = x, yl = y;
     __int128_t rl = xl * yl;
-    return (int64_t)(rl >> 64);    
+    return (int64_t)(rl >> 64);
 #else
     //full 128 bits are x0 * y0 + (x0 * y1 << 32) + (x1 * y0 << 32) + (x1 * y1 << 64)
     const uint32_t mask = 0xFFFFFFFF;
@@ -250,7 +250,7 @@ static inline int64_t libdivide__mullhi_s64(int64_t x, int64_t y) {
     return x1*(int64_t)y1 + (t >> 32) + (w1 >> 32);
 #endif
 }
-    
+
 #if LIBDIVIDE_USE_SSE2
 
 static inline __m128i libdivide__u64_to_m128(uint64_t x) {
@@ -275,7 +275,7 @@ static inline __m128i libdivide_get_FFFFFFFF00000000(void) {
     __m128i result = _mm_set1_epi8(-1); //optimizes to pcmpeqd on OS X
     return _mm_slli_epi64(result, 32);
 }
-    
+
 static inline __m128i libdivide_get_00000000FFFFFFFF(void) {
     //returns the same as _mm_set1_epi64(0x00000000FFFFFFFFULL) without touching memory
     __m128i result = _mm_set1_epi8(-1); //optimizes to pcmpeqd on OS X
@@ -288,7 +288,7 @@ static inline __m128i libdivide_get_0000FFFF(void) {
     __m128i result; //we don't care what its contents are
     result = _mm_cmpeq_epi8(result, result); //all 1s
     result = _mm_srli_epi32(result, 16);
-    return result;    
+    return result;
 }
 
 static inline __m128i libdivide_s64_signbits(__m128i v) {
@@ -302,7 +302,7 @@ static inline __m128i libdivide_s64_signbits(__m128i v) {
 static inline __m128i libdivide_u32_to_m128i(uint32_t amt) {
     return _mm_set_epi32(0, 0, 0, amt);
 }
-    
+
 static inline __m128i libdivide_s64_shift_right_vector(__m128i v, int amt) {
     //implementation of _mm_sra_epi64.  Here we have two 64 bit values which are shifted right to logically become (64 - amt) values, and are then sign extended from a (64 - amt) bit number.
     const int b = 64 - amt;
@@ -320,7 +320,7 @@ static inline __m128i libdivide__mullhi_u32_flat_vector(__m128i a, __m128i b) {
     return _mm_or_si128(hi_product_0Z2Z, hi_product_Z1Z3); // = hi_product_0123
 }
 
-    
+
 /* Here, y is assumed to contain one 64 bit value repeated twice. */
 static inline __m128i libdivide_mullhi_u64_flat_vector(__m128i x, __m128i y) {
     //full 128 bits are x0 * y0 + (x0 * y1 << 32) + (x1 * y0 << 32) + (x1 * y1 << 64)
@@ -331,12 +331,12 @@ static inline __m128i libdivide_mullhi_u64_flat_vector(__m128i x, __m128i y) {
     const __m128i x0y1 = _mm_mul_epu32(x0, y1);
     const __m128i x1y0 = _mm_mul_epu32(x1, y0);
     const __m128i x1y1 = _mm_mul_epu32(x1, y1);
-    
+
     const __m128i temp = _mm_add_epi64(x1y0, x0y0_hi);
     __m128i temp_lo = _mm_and_si128(temp, mask), temp_hi = _mm_srli_epi64(temp, 32);
     temp_lo = _mm_srli_epi64(_mm_add_epi64(temp_lo, x0y1), 32);
     temp_hi = _mm_add_epi64(x1y1, temp_hi);
-    
+
     return _mm_add_epi64(temp_lo, temp_hi);
 }
 
@@ -349,9 +349,9 @@ static inline __m128i libdivide_mullhi_s64_flat_vector(__m128i x, __m128i y) {
     p = _mm_sub_epi64(p, t2);
     return p;
 }
-    
+
 #ifdef LIBDIVIDE_USE_SSE4_1
-    
+
 /* b is one 32 bit value repeated four times. */
 static inline __m128i libdivide_mullhi_s32_flat_vector(__m128i a, __m128i b) {
     __m128i hi_product_0Z2Z = _mm_srli_epi64(_mm_mul_epi32(a, b), 32);
@@ -359,7 +359,7 @@ static inline __m128i libdivide_mullhi_s32_flat_vector(__m128i a, __m128i b) {
     __m128i hi_product_Z1Z3 = _mm_and_si128(_mm_mul_epi32(a1X3X, b), libdivide_get_FFFFFFFF00000000());
     return _mm_or_si128(hi_product_0Z2Z, hi_product_Z1Z3); // = hi_product_0123
 }
-    
+
 #else
 
 /* SSE2 does not have a signed multiplication instruction, but we can convert unsigned to signed pretty efficiently.  Again, b is just a 32 bit value repeated four times. */
@@ -373,7 +373,7 @@ static inline __m128i libdivide_mullhi_s32_flat_vector(__m128i a, __m128i b) {
 }
 #endif
 #endif
- 
+
 static inline int32_t libdivide__count_trailing_zeros32(uint32_t val) {
 #if __GNUC__ || __has_builtin(__builtin_ctz)
     /* Fast way to count trailing zeros */
@@ -389,7 +389,7 @@ static inline int32_t libdivide__count_trailing_zeros32(uint32_t val) {
     return result;
 #endif
 }
- 
+
 static inline int32_t libdivide__count_trailing_zeros64(uint64_t val) {
 #if __LP64__ && (__GNUC__ || __has_builtin(__builtin_ctzll))
     /* Fast way to count trailing zeros.  Note that we disable this in 32 bit because gcc does something horrible - it calls through to a dynamically bound function. */
@@ -401,11 +401,11 @@ static inline int32_t libdivide__count_trailing_zeros64(uint64_t val) {
     return 32 + libdivide__count_trailing_zeros32((uint32_t)(val >> 32));
 #endif
 }
- 
+
 static inline int32_t libdivide__count_leading_zeros32(uint32_t val) {
 #if __GNUC__ || __has_builtin(__builtin_clzll)
     /* Fast way to count leading zeros */
-    return __builtin_clz(val);    
+    return __builtin_clz(val);
 #else
     /* Dorky way to count leading zeros.  Note that this hangs for val = 0! */
     int32_t result = 0;
@@ -413,10 +413,10 @@ static inline int32_t libdivide__count_leading_zeros32(uint32_t val) {
         val <<= 1;
         result++;
     }
-    return result;    
+    return result;
 #endif
 }
-    
+
 static inline int32_t libdivide__count_leading_zeros64(uint64_t val) {
 #if __GNUC__ || __has_builtin(__builtin_clzll)
     /* Fast way to count leading zeros */
@@ -450,7 +450,7 @@ static uint32_t libdivide_64_div_32_to_32(uint32_t u1, uint32_t u0, uint32_t v,
     return result;
 }
 #endif
-    
+
 #if LIBDIVIDE_IS_X86_64 && LIBDIVIDE_GCC_STYLE_ASM
 static uint64_t libdivide_128_div_64_to_64(uint64_t u1, uint64_t u0, uint64_t v, uint64_t *r) {
     //u0 -> rax
@@ -465,10 +465,10 @@ static uint64_t libdivide_128_div_64_to_64(uint64_t u1, uint64_t u0, uint64_t v,
 
 }
 #else
- 
+
 /* Code taken from Hacker's Delight, http://www.hackersdelight.org/HDcode/divlu.c .  License permits inclusion here per http://www.hackersdelight.org/permissions.htm
  */
-static uint64_t libdivide_128_div_64_to_64(uint64_t u1, uint64_t u0, uint64_t v, uint64_t *r) {    
+static uint64_t libdivide_128_div_64_to_64(uint64_t u1, uint64_t u0, uint64_t v, uint64_t *r) {
     const uint64_t b = (1ULL << 32); // Number base (16 bits).
     uint64_t un1, un0,        // Norm. dividend LSD's.
     vn1, vn0,        // Norm. divisor digits.
@@ -476,25 +476,25 @@ static uint64_t libdivide_128_div_64_to_64(uint64_t u1, uint64_t u0, uint64_t v,
     un64, un21, un10,// Dividend digit pairs.
     rhat;            // A remainder.
     int s;                  // Shift amount for norm.
-    
+
     if (u1 >= v) {            // If overflow, set rem.
         if (r != NULL)         // to an impossible value,
             *r = (uint64_t)(-1);    // and return the largest
         return (uint64_t)(-1);}    // possible quotient.
-    
+
     /* count leading zeros */
     s = libdivide__count_leading_zeros64(v); // 0 <= s <= 63.
-    
+
     v = v << s;               // Normalize divisor.
     vn1 = v >> 32;            // Break divisor up into
     vn0 = v & 0xFFFFFFFF;     // two 32-bit digits.
-    
+
     un64 = (u1 << s) | ((u0 >> (64 - s)) & (-s >> 31));
     un10 = u0 << s;           // Shift dividend left.
-    
+
     un1 = un10 >> 32;         // Break right half of
     un0 = un10 & 0xFFFFFFFF;  // dividend into two digits.
-    
+
     q1 = un64/vn1;            // Compute the first
     rhat = un64 - q1*vn1;     // quotient digit, q1.
 again1:
@@ -502,9 +502,9 @@ again1:
         q1 = q1 - 1;
         rhat = rhat + vn1;
         if (rhat < b) goto again1;}
-    
+
     un21 = un64*b + un1 - q1*v;  // Multiply and subtract.
-    
+
     q0 = un21/vn1;            // Compute the second
     rhat = un21 - q0*vn1;     // quotient digit, q0.
 again2:
@@ -512,21 +512,21 @@ again2:
         q0 = q0 - 1;
         rhat = rhat + vn1;
         if (rhat < b) goto again2;}
-    
+
     if (r != NULL)            // If remainder is wanted,
         *r = (un21*b + un0 - q0*v) >> s;     // return it.
     return q1*b + q0;
 }
 #endif
-        
+
 #if LIBDIVIDE_ASSERTIONS_ON
 #define LIBDIVIDE_ASSERT(x) do { if (! (x)) { fprintf(stderr, "Assertion failure on line %ld: %s\n", (long)__LINE__, #x); exit(-1); } } while (0)
 #else
-#define LIBDIVIDE_ASSERT(x)    
+#define LIBDIVIDE_ASSERT(x)
 #endif
- 
+
 #ifndef LIBDIVIDE_HEADER_ONLY
-  
+
 ////////// UINT32
 
 struct libdivide_u32_t libdivide_u32_gen(uint32_t d) {
@@ -537,14 +537,14 @@ struct libdivide_u32_t libdivide_u32_gen(uint32_t d) {
     }
     else {
         const uint32_t floor_log_2_d = 31 - libdivide__count_leading_zeros32(d);
-        
+
         uint8_t more;
         uint32_t rem, proposed_m;
         proposed_m = libdivide_64_div_32_to_32(1U << floor_log_2_d, 0, d, &rem);
 
         LIBDIVIDE_ASSERT(rem > 0 && rem < d);
         const uint32_t e = d - rem;
-        
+
 	/* This power works if e < 2**floor_log_2_d. */
 	if (e < (1U << floor_log_2_d)) {
             /* This power works */
@@ -560,7 +560,7 @@ struct libdivide_u32_t libdivide_u32_gen(uint32_t d) {
         result.magic = 1 + proposed_m;
         result.more = more;
         //result.more's shift should in general be ceil_log_2_d.  But if we used the smaller power, we subtract one from the shift because we're using the smaller power. If we're using the larger power, we subtract one from the shift because it's taken care of by the add indicator.  So floor_log_2_d happens to be correct in both cases.
-        
+
     }
     return result;
 }
@@ -582,23 +582,23 @@ uint32_t libdivide_u32_do(uint32_t numer, const struct libdivide_u32_t *denom) {
     }
 }
 
- 
+
 int libdivide_u32_get_algorithm(const struct libdivide_u32_t *denom) {
     uint8_t more = denom->more;
     if (more & LIBDIVIDE_U32_SHIFT_PATH) return 0;
     else if (! (more & LIBDIVIDE_ADD_MARKER)) return 1;
     else return 2;
 }
- 
+
 uint32_t libdivide_u32_do_alg0(uint32_t numer, const struct libdivide_u32_t *denom) {
     return numer >> (denom->more & LIBDIVIDE_32_SHIFT_MASK);
 }
- 
+
 uint32_t libdivide_u32_do_alg1(uint32_t numer, const struct libdivide_u32_t *denom) {
     uint32_t q = libdivide__mullhi_u32(denom->magic, numer);
     return q >> denom->more;
-}    
- 
+}
+
 uint32_t libdivide_u32_do_alg2(uint32_t numer, const struct libdivide_u32_t *denom) {
     // denom->add != 0
     uint32_t q = libdivide__mullhi_u32(denom->magic, numer);
@@ -608,8 +608,8 @@ uint32_t libdivide_u32_do_alg2(uint32_t numer, const struct libdivide_u32_t *den
 
 
 
-    
-#if LIBDIVIDE_USE_SSE2    
+
+#if LIBDIVIDE_USE_SSE2
 __m128i libdivide_u32_do_vector(__m128i numers, const struct libdivide_u32_t *denom) {
     uint8_t more = denom->more;
     if (more & LIBDIVIDE_U32_SHIFT_PATH) {
@@ -622,7 +622,7 @@ __m128i libdivide_u32_do_vector(__m128i numers, const struct libdivide_u32_t *de
             //return t >> denom->shift;
             __m128i t = _mm_add_epi32(_mm_srli_epi32(_mm_sub_epi32(numers, q), 1), q);
             return _mm_srl_epi32(t, libdivide_u32_to_m128i(more & LIBDIVIDE_32_SHIFT_MASK));
-            
+
         }
         else {
             //q >> denom->shift
@@ -647,7 +647,7 @@ __m128i libdivide_u32_do_vector_alg2(__m128i numers, const struct libdivide_u32_
 }
 
 #endif
- 
+
 /////////// UINT64
 
 struct libdivide_u64_t libdivide_u64_gen(uint64_t d) {
@@ -658,14 +658,14 @@ struct libdivide_u64_t libdivide_u64_gen(uint64_t d) {
     }
     else {
         const uint32_t floor_log_2_d = 63 - libdivide__count_leading_zeros64(d);
-        
+
         uint64_t proposed_m, rem;
         uint8_t more;
         proposed_m = libdivide_128_div_64_to_64(1ULL << floor_log_2_d, 0, d, &rem); //== (1 << (64 + floor_log_2_d)) / d
 
         LIBDIVIDE_ASSERT(rem > 0 && rem < d);
         const uint64_t e = d - rem;
-	
+
 	/* This power works if e < 2**floor_log_2_d. */
 	if (e < (1ULL << floor_log_2_d)) {
             /* This power works */
@@ -702,30 +702,30 @@ uint64_t libdivide_u64_do(uint64_t numer, const struct libdivide_u64_t *denom) {
     }
 }
 
- 
+
 int libdivide_u64_get_algorithm(const struct libdivide_u64_t *denom) {
     uint8_t more = denom->more;
     if (more & LIBDIVIDE_U64_SHIFT_PATH) return 0;
     else if (! (more & LIBDIVIDE_ADD_MARKER)) return 1;
     else return 2;
 }
- 
+
 uint64_t libdivide_u64_do_alg0(uint64_t numer, const struct libdivide_u64_t *denom) {
-    return numer >> (denom->more & LIBDIVIDE_64_SHIFT_MASK);    
+    return numer >> (denom->more & LIBDIVIDE_64_SHIFT_MASK);
 }
- 
+
 uint64_t libdivide_u64_do_alg1(uint64_t numer, const struct libdivide_u64_t *denom) {
     uint64_t q = libdivide__mullhi_u64(denom->magic, numer);
     return q >> denom->more;
 }
- 
+
 uint64_t libdivide_u64_do_alg2(uint64_t numer, const struct libdivide_u64_t *denom) {
     uint64_t q = libdivide__mullhi_u64(denom->magic, numer);
     uint64_t t = ((numer - q) >> 1) + q;
     return t >> (denom->more & LIBDIVIDE_64_SHIFT_MASK);
 }
- 
-#if LIBDIVIDE_USE_SSE2    
+
+#if LIBDIVIDE_USE_SSE2
 __m128i libdivide_u64_do_vector(__m128i numers, const struct libdivide_u64_t * denom) {
     uint8_t more = denom->more;
     if (more & LIBDIVIDE_U64_SHIFT_PATH) {
@@ -761,11 +761,11 @@ __m128i libdivide_u64_do_vector_alg2(__m128i numers, const struct libdivide_u64_
     return _mm_srl_epi64(t, libdivide_u32_to_m128i(denom->more & LIBDIVIDE_64_SHIFT_MASK));
 }
 
-    
+
 #endif
- 
+
 /////////// SINT32
- 
+
 
 static inline int32_t libdivide__mullhi_s32(int32_t x, int32_t y) {
     int64_t xl = x, yl = y;
@@ -775,7 +775,7 @@ static inline int32_t libdivide__mullhi_s32(int32_t x, int32_t y) {
 
 struct libdivide_s32_t libdivide_s32_gen(int32_t d) {
     struct libdivide_s32_t result;
-    
+
     /* If d is a power of 2, or negative a power of 2, we have to use a shift.  This is especially important because the magic algorithm fails for -1.  To check if d is a power of 2 or its inverse, it suffices to check whether its absolute value has exactly one bit set.  This works even for INT_MIN, because abs(INT_MIN) == INT_MIN, and INT_MIN has one bit set and is a power of 2.  */
     uint32_t absD = (uint32_t)(d < 0 ? -d : d); //gcc optimizes this to the fast abs trick
     if ((absD & (absD - 1)) == 0) { //check if exactly one bit is set, don't care if absD is 0 since that's divide by zero
@@ -784,14 +784,14 @@ struct libdivide_s32_t libdivide_s32_gen(int32_t d) {
     }
     else {
         const uint32_t floor_log_2_d = 31 - libdivide__count_leading_zeros32(absD);
-        LIBDIVIDE_ASSERT(floor_log_2_d >= 1);    
-        
+        LIBDIVIDE_ASSERT(floor_log_2_d >= 1);
+
         uint8_t more;
         //the dividend here is 2**(floor_log_2_d + 31), so the low 32 bit word is 0 and the high word is floor_log_2_d - 1
         uint32_t rem, proposed_m;
         proposed_m = libdivide_64_div_32_to_32(1U << (floor_log_2_d - 1), 0, absD, &rem);
         const uint32_t e = absD - rem;
-        
+
         /* We are going to start with a power of floor_log_2_d - 1.  This works if works if e < 2**floor_log_2_d. */
         if (e < (1U << floor_log_2_d)) {
             /* This power works */
@@ -807,7 +807,7 @@ struct libdivide_s32_t libdivide_s32_gen(int32_t d) {
         proposed_m += 1;
         result.magic = (d < 0 ? -(int32_t)proposed_m : (int32_t)proposed_m);
         result.more = more;
-        
+
     }
     return result;
 }
@@ -832,57 +832,57 @@ int32_t libdivide_s32_do(int32_t numer, const struct libdivide_s32_t *denom) {
         q += (q < 0);
         return q;
     }
-}    
- 
+}
+
 int libdivide_s32_get_algorithm(const struct libdivide_s32_t *denom) {
     uint8_t more = denom->more;
     int positiveDivisor = ! (more & LIBDIVIDE_NEGATIVE_DIVISOR);
     if (more & LIBDIVIDE_S32_SHIFT_PATH) return (positiveDivisor ? 0 : 1);
-    else if (more & LIBDIVIDE_ADD_MARKER) return (positiveDivisor ? 2 : 3); 
+    else if (more & LIBDIVIDE_ADD_MARKER) return (positiveDivisor ? 2 : 3);
     else return 4;
 }
- 
+
 int32_t libdivide_s32_do_alg0(int32_t numer, const struct libdivide_s32_t *denom) {
     uint8_t shifter = denom->more & LIBDIVIDE_32_SHIFT_MASK;
     int32_t q = numer + ((numer >> 31) & ((1 << shifter) - 1));
     return q >> shifter;
 }
- 
+
 int32_t libdivide_s32_do_alg1(int32_t numer, const struct libdivide_s32_t *denom) {
     uint8_t shifter = denom->more & LIBDIVIDE_32_SHIFT_MASK;
     int32_t q = numer + ((numer >> 31) & ((1 << shifter) - 1));
     return - (q >> shifter);
 }
- 
+
 int32_t libdivide_s32_do_alg2(int32_t numer, const struct libdivide_s32_t *denom) {
     int32_t q = libdivide__mullhi_s32(denom->magic, numer);
     q += numer;
     q >>= denom->more & LIBDIVIDE_32_SHIFT_MASK;
-    q += (q < 0);    
+    q += (q < 0);
     return q;
 }
- 
+
 int32_t libdivide_s32_do_alg3(int32_t numer, const struct libdivide_s32_t *denom) {
     int32_t q = libdivide__mullhi_s32(denom->magic, numer);
     q -= numer;
     q >>= denom->more & LIBDIVIDE_32_SHIFT_MASK;
-    q += (q < 0);    
-    return q;
-}
- 
-int32_t libdivide_s32_do_alg4(int32_t numer, const struct libdivide_s32_t *denom) {
-    int32_t q = libdivide__mullhi_s32(denom->magic, numer);
-    q >>= denom->more & LIBDIVIDE_32_SHIFT_MASK;
-    q += (q < 0);    
+    q += (q < 0);
     return q;
 }
 
-#if LIBDIVIDE_USE_SSE2    
+int32_t libdivide_s32_do_alg4(int32_t numer, const struct libdivide_s32_t *denom) {
+    int32_t q = libdivide__mullhi_s32(denom->magic, numer);
+    q >>= denom->more & LIBDIVIDE_32_SHIFT_MASK;
+    q += (q < 0);
+    return q;
+}
+
+#if LIBDIVIDE_USE_SSE2
 __m128i libdivide_s32_do_vector(__m128i numers, const struct libdivide_s32_t * denom) {
     uint8_t more = denom->more;
     if (more & LIBDIVIDE_S32_SHIFT_PATH) {
         uint32_t shifter = more & LIBDIVIDE_32_SHIFT_MASK;
-        __m128i roundToZeroTweak = _mm_set1_epi32((1 << shifter) - 1); //could use _mm_srli_epi32 with an all -1 register        
+        __m128i roundToZeroTweak = _mm_set1_epi32((1 << shifter) - 1); //could use _mm_srli_epi32 with an all -1 register
         __m128i q = _mm_add_epi32(numers, _mm_and_si128(_mm_srai_epi32(numers, 31), roundToZeroTweak)); //q = numer + ((numer >> 31) & roundToZeroTweak);
         q = _mm_sra_epi32(q, libdivide_u32_to_m128i(shifter)); // q = q >> shifter
         __m128i shiftMask = _mm_set1_epi32((int32_t)((int8_t)more >> 7)); //set all bits of shift mask = to the sign bit of more
@@ -893,7 +893,7 @@ __m128i libdivide_s32_do_vector(__m128i numers, const struct libdivide_s32_t * d
         __m128i q = libdivide_mullhi_s32_flat_vector(numers, _mm_set1_epi32(denom->magic));
         if (more & LIBDIVIDE_ADD_MARKER) {
             __m128i sign = _mm_set1_epi32((int32_t)(int8_t)more >> 7); //must be arithmetic shift
-            q = _mm_add_epi32(q, _mm_sub_epi32(_mm_xor_si128(numers, sign), sign)); // q += ((numer ^ sign) - sign);        
+            q = _mm_add_epi32(q, _mm_sub_epi32(_mm_xor_si128(numers, sign), sign)); // q += ((numer ^ sign) - sign);
         }
         q = _mm_sra_epi32(q, libdivide_u32_to_m128i(more & LIBDIVIDE_32_SHIFT_MASK)); //q >>= shift
         q = _mm_add_epi32(q, _mm_srli_epi32(q, 31)); // q += (q < 0)
@@ -919,7 +919,7 @@ __m128i libdivide_s32_do_vector_alg2(__m128i numers, const struct libdivide_s32_
     __m128i q = libdivide_mullhi_s32_flat_vector(numers, _mm_set1_epi32(denom->magic));
     q = _mm_add_epi32(q, numers);
     q = _mm_sra_epi32(q, libdivide_u32_to_m128i(denom->more & LIBDIVIDE_32_SHIFT_MASK));
-    q = _mm_add_epi32(q, _mm_srli_epi32(q, 31));    
+    q = _mm_add_epi32(q, _mm_srli_epi32(q, 31));
     return q;
 }
 
@@ -927,7 +927,7 @@ __m128i libdivide_s32_do_vector_alg3(__m128i numers, const struct libdivide_s32_
     __m128i q = libdivide_mullhi_s32_flat_vector(numers, _mm_set1_epi32(denom->magic));
     q = _mm_sub_epi32(q, numers);
     q = _mm_sra_epi32(q, libdivide_u32_to_m128i(denom->more & LIBDIVIDE_32_SHIFT_MASK));
-    q = _mm_add_epi32(q, _mm_srli_epi32(q, 31));    
+    q = _mm_add_epi32(q, _mm_srli_epi32(q, 31));
     return q;
 }
 
@@ -935,16 +935,16 @@ __m128i libdivide_s32_do_vector_alg4(__m128i numers, const struct libdivide_s32_
     __m128i q = libdivide_mullhi_s32_flat_vector(numers, _mm_set1_epi32(denom->magic));
     q = _mm_sra_epi32(q, libdivide_u32_to_m128i(denom->more)); //q >>= shift
     q = _mm_add_epi32(q, _mm_srli_epi32(q, 31)); // q += (q < 0)
-    return q;    
+    return q;
 }
 #endif
-    
+
 ///////////// SINT64
- 
+
 
 struct libdivide_s64_t libdivide_s64_gen(int64_t d) {
     struct libdivide_s64_t result;
-    
+
     /* If d is a power of 2, or negative a power of 2, we have to use a shift.  This is especially important because the magic algorithm fails for -1.  To check if d is a power of 2 or its inverse, it suffices to check whether its absolute value has exactly one bit set.  This works even for INT_MIN, because abs(INT_MIN) == INT_MIN, and INT_MIN has one bit set and is a power of 2.  */
     const uint64_t absD = (uint64_t)(d < 0 ? -d : d); //gcc optimizes this to the fast abs trick
     if ((absD & (absD - 1)) == 0) { //check if exactly one bit is set, don't care if absD is 0 since that's divide by zero
@@ -952,14 +952,14 @@ struct libdivide_s64_t libdivide_s64_gen(int64_t d) {
         result.magic = 0;
     }
     else {
-        const uint32_t floor_log_2_d = 63 - libdivide__count_leading_zeros64(absD);  
-        
+        const uint32_t floor_log_2_d = 63 - libdivide__count_leading_zeros64(absD);
+
         //the dividend here is 2**(floor_log_2_d + 63), so the low 64 bit word is 0 and the high word is floor_log_2_d - 1
         uint8_t more;
         uint64_t rem, proposed_m;
         proposed_m = libdivide_128_div_64_to_64(1ULL << (floor_log_2_d - 1), 0, absD, &rem);
         const uint64_t e = absD - rem;
-        
+
         /* We are going to start with a power of floor_log_2_d - 1.  This works if works if e < 2**floor_log_2_d. */
         if (e < (1ULL << floor_log_2_d)) {
             /* This power works */
@@ -1000,9 +1000,9 @@ int64_t libdivide_s64_do(int64_t numer, const struct libdivide_s64_t *denom) {
         q += (q < 0);
         return q;
     }
-}    
-    
- 
+}
+
+
 int libdivide_s64_get_algorithm(const struct libdivide_s64_t *denom) {
     uint8_t more = denom->more;
     int positiveDivisor = ! (more & LIBDIVIDE_NEGATIVE_DIVISOR);
@@ -1010,20 +1010,20 @@ int libdivide_s64_get_algorithm(const struct libdivide_s64_t *denom) {
     else if (more & LIBDIVIDE_ADD_MARKER) return (positiveDivisor ? 2 : 3);
     else return 4;
 }
- 
+
 int64_t libdivide_s64_do_alg0(int64_t numer, const struct libdivide_s64_t *denom) {
     uint32_t shifter = denom->more & LIBDIVIDE_64_SHIFT_MASK;
     int64_t q = numer + ((numer >> 63) & ((1LL << shifter) - 1));
-    return q >> shifter;    
+    return q >> shifter;
 }
- 
+
 int64_t libdivide_s64_do_alg1(int64_t numer, const struct libdivide_s64_t *denom) {
     //denom->shifter != -1 && demo->shiftMask != 0
     uint32_t shifter = denom->more & LIBDIVIDE_64_SHIFT_MASK;
     int64_t q = numer + ((numer >> 63) & ((1LL << shifter) - 1));
     return - (q >> shifter);
 }
- 
+
 int64_t libdivide_s64_do_alg2(int64_t numer, const struct libdivide_s64_t *denom) {
     int64_t q = libdivide__mullhi_s64(denom->magic, numer);
     q += numer;
@@ -1031,20 +1031,20 @@ int64_t libdivide_s64_do_alg2(int64_t numer, const struct libdivide_s64_t *denom
     q += (q < 0);
     return q;
 }
-    
+
 int64_t libdivide_s64_do_alg3(int64_t numer, const struct libdivide_s64_t *denom) {
     int64_t q = libdivide__mullhi_s64(denom->magic, numer);
     q -= numer;
     q >>= denom->more & LIBDIVIDE_64_SHIFT_MASK;
-    q += (q < 0);    
+    q += (q < 0);
     return q;
 }
-    
+
 int64_t libdivide_s64_do_alg4(int64_t numer, const struct libdivide_s64_t *denom) {
     int64_t q = libdivide__mullhi_s64(denom->magic, numer);
     q >>= denom->more;
     q += (q < 0);
-    return q;   
+    return q;
 }
 
 
@@ -1065,7 +1065,7 @@ __m128i libdivide_s64_do_vector(__m128i numers, const struct libdivide_s64_t * d
         __m128i q = libdivide_mullhi_s64_flat_vector(numers, libdivide__u64_to_m128(magic));
         if (more & LIBDIVIDE_ADD_MARKER) {
             __m128i sign = _mm_set1_epi32((int32_t)((int8_t)more >> 7)); //must be arithmetic shift
-            q = _mm_add_epi64(q, _mm_sub_epi64(_mm_xor_si128(numers, sign), sign)); // q += ((numer ^ sign) - sign);        
+            q = _mm_add_epi64(q, _mm_sub_epi64(_mm_xor_si128(numers, sign), sign)); // q += ((numer ^ sign) - sign);
         }
         q = libdivide_s64_shift_right_vector(q, more & LIBDIVIDE_64_SHIFT_MASK); //q >>= denom->mult_path.shift
         q = _mm_add_epi64(q, _mm_srli_epi64(q, 63)); // q += (q < 0)
@@ -1102,20 +1102,20 @@ __m128i libdivide_s64_do_vector_alg3(__m128i numers, const struct libdivide_s64_
     q = _mm_sub_epi64(q, numers);
     q = libdivide_s64_shift_right_vector(q, denom->more & LIBDIVIDE_64_SHIFT_MASK);
     q = _mm_add_epi64(q, _mm_srli_epi64(q, 63)); // q += (q < 0)
-    return q;    
+    return q;
 }
 
 __m128i libdivide_s64_do_vector_alg4(__m128i numers, const struct libdivide_s64_t *denom) {
     __m128i q = libdivide_mullhi_s64_flat_vector(numers, libdivide__u64_to_m128(denom->magic));
     q = libdivide_s64_shift_right_vector(q, denom->more);
     q = _mm_add_epi64(q, _mm_srli_epi64(q, 63));
-    return q;   
+    return q;
 }
 
 #endif
- 
+
 /////////// C++ stuff
- 
+
 #ifdef __cplusplus
 
 /* The C++ template design here is a total mess.  This needs to be fixed by someone better at templates than I.  The current design is:
@@ -1131,7 +1131,7 @@ __m128i libdivide_s64_do_vector_alg4(__m128i numers, const struct libdivide_s64_
 */
 
 namespace libdivide_internal {
-    
+
 #if LIBDIVIDE_USE_SSE2
 #define MAYBE_VECTOR(x) x
 #define MAYBE_VECTOR_PARAM __m128i vector_func(__m128i, const DenomType *)
@@ -1149,12 +1149,12 @@ namespace libdivide_internal {
 #endif
 
     template<typename IntType, typename DenomType, DenomType gen_func(IntType), int get_algo(const DenomType *), IntType do_func(IntType, const DenomType *), MAYBE_VECTOR_PARAM>
-    class divider_base {  
+    class divider_base {
     public:
         DenomType denom;
         divider_base(IntType d) : denom(gen_func(d)) { }
         divider_base(const DenomType & d) : denom(d) { }
-        
+
         IntType perform_divide(IntType val) const { return do_func(val, &denom); }
 #if LIBDIVIDE_USE_SSE2
         __m128i perform_divide_vector(__m128i val) const { return vector_func(val, &denom); }
@@ -1162,37 +1162,37 @@ namespace libdivide_internal {
 
         int get_algorithm() const { return get_algo(&denom); }
     };
-    
-    
+
+
     template<class T> struct divider_mid { };
-    
+
     template<> struct divider_mid<uint32_t> {
         typedef uint32_t IntType;
         typedef struct libdivide_u32_t DenomType;
         template<IntType do_func(IntType, const DenomType *), MAYBE_VECTOR_PARAM> struct denom {
             typedef divider_base<IntType, DenomType, libdivide_u32_gen, libdivide_u32_get_algorithm, do_func, vector_func> divider;
         };
-        
+
         template<int ALGO, int J = 0> struct algo { };
         template<int J> struct algo<-1, J> { typedef denom<libdivide_u32_do, MAYBE_VECTOR(libdivide_u32_do_vector)>::divider divider; };
         template<int J> struct algo<0, J>  { typedef denom<libdivide_u32_do_alg0, MAYBE_VECTOR(libdivide_u32_do_vector_alg0)>::divider divider; };
         template<int J> struct algo<1, J>  { typedef denom<libdivide_u32_do_alg1, MAYBE_VECTOR(libdivide_u32_do_vector_alg1)>::divider divider; };
         template<int J> struct algo<2, J>  { typedef denom<libdivide_u32_do_alg2, MAYBE_VECTOR(libdivide_u32_do_vector_alg2)>::divider divider; };
-      
-        /* Define two more bogus ones so that the same (templated, presumably) code can handle both signed and unsigned */  
+
+        /* Define two more bogus ones so that the same (templated, presumably) code can handle both signed and unsigned */
         template<int J> struct algo<3, J>  { typedef denom<crash_u32, MAYBE_VECTOR(crash_u32_vector)>::divider divider; };
         template<int J> struct algo<4, J>  { typedef denom<crash_u32, MAYBE_VECTOR(crash_u32_vector)>::divider divider; };
 
     };
-    
+
     template<> struct divider_mid<int32_t> {
         typedef int32_t IntType;
         typedef struct libdivide_s32_t DenomType;
         template<IntType do_func(IntType, const DenomType *), MAYBE_VECTOR_PARAM> struct denom {
             typedef divider_base<IntType, DenomType, libdivide_s32_gen, libdivide_s32_get_algorithm, do_func, vector_func> divider;
         };
-        
-      
+
+
         template<int ALGO, int J = 0> struct algo { };
         template<int J> struct algo<-1, J> { typedef denom<libdivide_s32_do, MAYBE_VECTOR(libdivide_s32_do_vector)>::divider divider; };
         template<int J> struct algo<0, J>  { typedef denom<libdivide_s32_do_alg0, MAYBE_VECTOR(libdivide_s32_do_vector_alg0)>::divider divider; };
@@ -1200,36 +1200,36 @@ namespace libdivide_internal {
         template<int J> struct algo<2, J>  { typedef denom<libdivide_s32_do_alg2, MAYBE_VECTOR(libdivide_s32_do_vector_alg2)>::divider divider; };
         template<int J> struct algo<3, J>  { typedef denom<libdivide_s32_do_alg3, MAYBE_VECTOR(libdivide_s32_do_vector_alg3)>::divider divider; };
         template<int J> struct algo<4, J>  { typedef denom<libdivide_s32_do_alg4, MAYBE_VECTOR(libdivide_s32_do_vector_alg4)>::divider divider; };
-        
+
     };
-    
+
     template<> struct divider_mid<uint64_t> {
         typedef uint64_t IntType;
         typedef struct libdivide_u64_t DenomType;
         template<IntType do_func(IntType, const DenomType *), MAYBE_VECTOR_PARAM> struct denom {
             typedef divider_base<IntType, DenomType, libdivide_u64_gen, libdivide_u64_get_algorithm, do_func, vector_func> divider;
         };
-        
+
         template<int ALGO, int J = 0> struct algo { };
         template<int J> struct algo<-1, J> { typedef denom<libdivide_u64_do, MAYBE_VECTOR(libdivide_u64_do_vector)>::divider divider; };
         template<int J> struct algo<0, J>  { typedef denom<libdivide_u64_do_alg0, MAYBE_VECTOR(libdivide_u64_do_vector_alg0)>::divider divider; };
         template<int J> struct algo<1, J>  { typedef denom<libdivide_u64_do_alg1, MAYBE_VECTOR(libdivide_u64_do_vector_alg1)>::divider divider; };
         template<int J> struct algo<2, J>  { typedef denom<libdivide_u64_do_alg2, MAYBE_VECTOR(libdivide_u64_do_vector_alg2)>::divider divider; };
-        
+
         /* Define two more bogus ones so that the same (templated, presumably) code can handle both signed and unsigned */
         template<int J> struct algo<3, J>  { typedef denom<crash_u64, MAYBE_VECTOR(crash_u64_vector)>::divider divider; };
         template<int J> struct algo<4, J>  { typedef denom<crash_u64, MAYBE_VECTOR(crash_u64_vector)>::divider divider; };
 
 
     };
-    
+
     template<> struct divider_mid<int64_t> {
         typedef int64_t IntType;
         typedef struct libdivide_s64_t DenomType;
         template<IntType do_func(IntType, const DenomType *), MAYBE_VECTOR_PARAM> struct denom {
             typedef divider_base<IntType, DenomType, libdivide_s64_gen, libdivide_s64_get_algorithm, do_func, vector_func> divider;
         };
-        
+
         template<int ALGO, int J = 0> struct algo { };
         template<int J> struct algo<-1, J> { typedef denom<libdivide_s64_do, MAYBE_VECTOR(libdivide_s64_do_vector)>::divider divider; };
         template<int J> struct algo<0, J>  { typedef denom<libdivide_s64_do_alg0, MAYBE_VECTOR(libdivide_s64_do_vector_alg0)>::divider divider; };
@@ -1248,29 +1248,29 @@ class divider
     typename libdivide_internal::divider_mid<T>::template algo<ALGO>::divider sub;
     template<int NEW_ALGO, typename S> friend divider<S, NEW_ALGO> unswitch(const divider<S, -1> & d);
     divider(const typename libdivide_internal::divider_mid<T>::DenomType & denom) : sub(denom) { }
-    
+
     public:
-    
+
     /* Ordinary constructor, that takes the divisor as a parameter. */
     divider(T n) : sub(n) { }
-    
+
     /* Default constructor, that divides by 1 */
     divider() : sub(1) { }
-    
+
     /* Divides the parameter by the divisor, returning the quotient */
     T perform_divide(T val) const { return sub.perform_divide(val); }
-    
+
 #if LIBDIVIDE_USE_SSE2
     /* Treats the vector as either two or four packed values (depending on the size), and divides each of them by the divisor, returning the packed quotients. */
-    __m128i perform_divide_vector(__m128i val) const { return sub.perform_divide_vector(val); } 
+    __m128i perform_divide_vector(__m128i val) const { return sub.perform_divide_vector(val); }
 #endif
 
     /* Returns the index of algorithm, for use in the unswitch function */
     int get_algorithm() const { return sub.get_algorithm(); } // returns the algorithm for unswitching
-    
+
     /* operator== */
     bool operator==(const divider<T, ALGO> & him) const { return sub.denom.magic == him.sub.denom.magic && sub.denom.more == him.sub.denom.more; }
-    
+
     bool operator!=(const divider<T, ALGO> & him) const { return ! (*this == him); }
 };
 
@@ -1291,10 +1291,10 @@ __m128i operator/(__m128i numer, const divider<int_type, ALGO> & denom) {
     return denom.perform_divide_vector(numer);
 }
 #endif
- 
- 
+
+
 #endif //__cplusplus
-    
+
 #endif //LIBDIVIDE_HEADER_ONLY
 #ifdef __cplusplus
 } //close namespace libdivide

Minecraft.Client/PSVita/PSVitaExtras/zconf.h

@@ -485,7 +485,7 @@ typedef uLong FAR uLongf;
 #  define z_off64_t off64_t
 #else
 #  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-#    define z_off64_t __int64
+#    define z_off64_t int64_t
 #  else
 #    define z_off64_t z_off_t
 #  endif

Minecraft.Client/PSVita/PSVita_App.cpp

@@ -307,7 +307,7 @@ void CConsoleMinecraftApp::TemporaryCreateGameStart()
 	wstring wWorldName = L"TestWorld";
 
 	bool isFlat = false;
-	__int64 seedValue = 0;//BiomeSource::findSeed(isFlat?LevelType::lvl_flat:LevelType::lvl_normal);	// 4J - was (new Random())->nextLong() - now trying to actually find a seed to suit our requirements
+	int64_t seedValue = 0;//BiomeSource::findSeed(isFlat?LevelType::lvl_flat:LevelType::lvl_normal);	// 4J - was (new Random())->nextLong() - now trying to actually find a seed to suit our requirements
 
 	NetworkGameInitData *param = new NetworkGameInitData();
 	param->seed = seedValue;
@@ -320,7 +320,7 @@ void CConsoleMinecraftApp::TemporaryCreateGameStart()
 	app.SetGameHostOption(eGameHostOption_Gamertags,1);
 	app.SetGameHostOption(eGameHostOption_BedrockFog,1);
 
-	app.SetGameHostOption(eGameHostOption_GameType,GameType::CREATIVE->getId());	
+	app.SetGameHostOption(eGameHostOption_GameType,GameType::CREATIVE->getId());
 	app.SetGameHostOption(eGameHostOption_LevelType, 0 );
 	app.SetGameHostOption(eGameHostOption_Structures, 1 );
 	app.SetGameHostOption(eGameHostOption_BonusChest, 0 );
@@ -391,7 +391,7 @@ void CConsoleMinecraftApp::CommerceTick()
 
 			break;
 		case eCommerce_State_GetProductList:
-			{	
+			{
 				m_eCommerce_State=eCommerce_State_GetProductList_Pending;
 				SonyCommerce::CategoryInfo *pCategories=app.GetCategoryInfo();
 				std::list<SonyCommerce::CategoryInfoSub>::iterator iter = pCategories->subCategories.begin();
@@ -407,7 +407,7 @@ void CConsoleMinecraftApp::CommerceTick()
 
 			break;
 		case eCommerce_State_AddProductInfoDetailed:
-			{	
+			{
 				m_eCommerce_State=eCommerce_State_AddProductInfoDetailed_Pending;
 
 				// for each of the products in the categories, get the detailed info. We really only need the long description and price info.
@@ -444,7 +444,7 @@ void CConsoleMinecraftApp::CommerceTick()
 			break;
 
 		case eCommerce_State_RegisterDLC:
-			{	
+			{
 				m_eCommerce_State=eCommerce_State_Online;
 				// register the DLC info
 				SonyCommerce::CategoryInfo *pCategories=app.GetCategoryInfo();
@@ -531,20 +531,20 @@ SonyCommerce::CategoryInfo *CConsoleMinecraftApp::GetCategoryInfo()
 
 	return &m_CategoryInfo;
 }
-#endif 
+#endif
 
 void CConsoleMinecraftApp::ClearCommerceDetails()
 {
 #ifdef VITA_COMMERCE_ENABLED
 	for(int i=0;i<m_ProductListCategoriesC;i++)
 	{
-		std::vector<SonyCommerce::ProductInfo>* pProductList=&m_ProductListA[i];	
+		std::vector<SonyCommerce::ProductInfo>* pProductList=&m_ProductListA[i];
 		pProductList->clear();
 	}
 
 	if(m_ProductListA!=NULL)
 	{
-		delete [] m_ProductListA;	
+		delete [] m_ProductListA;
 		m_ProductListA=NULL;
 	}
 
@@ -580,11 +580,11 @@ void CConsoleMinecraftApp::GetDLCSkuIDFromProductList(char * pchDLCProductID, ch
 			{
 				SonyCommerce::ProductInfo Info=*it;
 				if(strcmp(pchDLCProductID,Info.productId)==0)
-				{	
+				{
 					memcpy(pchSkuID,Info.skuId,SCE_NP_COMMERCE2_SKU_ID_LEN);
 					return;
 				}
-			}		
+			}
 		}
 	}
 	return;
@@ -607,18 +607,18 @@ void CConsoleMinecraftApp::Checkout(char *pchSkuID)
 			{
 				SonyCommerce::ProductInfo Info=*it;
 				if(strcmp(pchSkuID,Info.skuId)==0)
-				{	
+				{
 					productInfo = &(*it);
 					break;
 				}
-			}		
+			}
 		}
 	}
 
 	if(productInfo)
 	{
 		if(m_eCommerce_State==eCommerce_State_Online)
-		{	
+		{
 			strcpy(m_pchSkuID,productInfo->skuId);
 			m_pCheckoutProductInfo = productInfo;
 			m_eCommerce_State=eCommerce_State_Checkout;
@@ -633,7 +633,7 @@ void CConsoleMinecraftApp::Checkout(char *pchSkuID)
 void CConsoleMinecraftApp::DownloadAlreadyPurchased(char *pchSkuID)
 {
 	if(m_eCommerce_State==eCommerce_State_Online)
-	{	
+	{
 		strcpy(m_pchSkuID,pchSkuID);
 		m_eCommerce_State=eCommerce_State_DownloadAlreadyPurchased;
 	}
@@ -642,7 +642,7 @@ void CConsoleMinecraftApp::DownloadAlreadyPurchased(char *pchSkuID)
 bool CConsoleMinecraftApp::UpgradeTrial()
 {
 	if(m_eCommerce_State==eCommerce_State_Online)
-	{	
+	{
 		m_eCommerce_State=eCommerce_State_UpgradeTrial;
 		return true;
 	}
@@ -687,7 +687,7 @@ bool CConsoleMinecraftApp::DLCAlreadyPurchased(char *pchTitle)
 			{
 				SonyCommerce::ProductInfo Info=*it;
 				if(strcmp(pchTitle,Info.skuId)==0)
-				{				
+				{
 					if(Info.purchasabilityFlag==SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED)
 					{
 						return false;
@@ -697,7 +697,7 @@ bool CConsoleMinecraftApp::DLCAlreadyPurchased(char *pchTitle)
 						return true;
 					}
 				}
-			}		
+			}
 		}
 	}
 #endif //#ifdef VITA_COMMERCE_ENABLED
@@ -734,7 +734,7 @@ void CConsoleMinecraftApp::CommerceGetCategoriesCallback(LPVOID lpParam,int err)
 	if(err==0)
 	{
 		pClass->m_ProductListCategoriesC=pClass->m_CategoryInfo.countOfSubCategories;
-		// allocate the memory for the product info for each categories 
+		// allocate the memory for the product info for each categories
 		if(pClass->m_CategoryInfo.countOfSubCategories>0)
 		{
 			pClass->m_ProductListA = (std::vector<SonyCommerce::ProductInfo> *) new std::vector<SonyCommerce::ProductInfo> [pClass->m_CategoryInfo.countOfSubCategories];
@@ -768,7 +768,7 @@ void CConsoleMinecraftApp::CommerceGetProductListCallback(LPVOID lpParam,int err
 		{
 			// we're done, so now retrieve the additional product details for each product
 			pClass->m_eCommerce_State=eCommerce_State_AddProductInfoDetailed;
-			pClass->m_bCommerceProductListRetrieved=true;		
+			pClass->m_bCommerceProductListRetrieved=true;
 		}
 		else
 		{
@@ -778,21 +778,21 @@ void CConsoleMinecraftApp::CommerceGetProductListCallback(LPVOID lpParam,int err
 	else
 	{
 		pClass->m_eCommerce_State=eCommerce_State_Error;
-		pClass->m_bCommerceProductListRetrieved=true;		
+		pClass->m_bCommerceProductListRetrieved=true;
 	}
 }
 
 // void CConsoleMinecraftApp::CommerceGetDetailedProductInfoCallback(LPVOID lpParam,int err)
 // {
 // 	CConsoleMinecraftApp *pScene=(CConsoleMinecraftApp *)lpParam;
-// 
+//
 // 	if(err==0)
 // 	{
 // 		pScene->m_eCommerce_State=eCommerce_State_Idle;
-// 		//pScene->m_bCommerceProductListRetrieved=true;		
+// 		//pScene->m_bCommerceProductListRetrieved=true;
 // 	}
 // 	//printf("Callback hit, error 0x%08x\n", err);
-// 
+//
 // }
 
 void CConsoleMinecraftApp::CommerceAddDetailedProductInfoCallback(LPVOID lpParam,int err)
@@ -812,7 +812,7 @@ void CConsoleMinecraftApp::CommerceAddDetailedProductInfoCallback(LPVOID lpParam
 		{
 			// MGH - change this to a while loop so we can skip empty categories.
 			do
-			{ 
+			{
 				pClass->m_iCurrentCategory++;
 			}while(pClass->m_ProductListA[pClass->m_iCurrentCategory].size() == 0 && pClass->m_iCurrentCategory<pClass->m_ProductListCategoriesC);
 
@@ -821,12 +821,12 @@ void CConsoleMinecraftApp::CommerceAddDetailedProductInfoCallback(LPVOID lpParam
 			{
 				// there are no more categories, so we're done
 				pClass->m_eCommerce_State=eCommerce_State_RegisterDLC;
-				pClass->m_bProductListAdditionalDetailsRetrieved=true;		
+				pClass->m_bProductListAdditionalDetailsRetrieved=true;
 			}
 			else
 			{
 				// continue with the next category
-				pClass->m_eCommerce_State=eCommerce_State_AddProductInfoDetailed;				
+				pClass->m_eCommerce_State=eCommerce_State_AddProductInfoDetailed;
 			}
 		}
 		else
@@ -838,7 +838,7 @@ void CConsoleMinecraftApp::CommerceAddDetailedProductInfoCallback(LPVOID lpParam
 	else
 	{
 		pClass->m_eCommerce_State=eCommerce_State_Error;
-		pClass->m_bProductListAdditionalDetailsRetrieved=true;	
+		pClass->m_bProductListAdditionalDetailsRetrieved=true;
 		pClass->m_iCurrentProduct=0;
 		pClass->m_iCurrentCategory=0;
 	}
@@ -1109,7 +1109,7 @@ void printSaveState()
 	case C4JStorage::ESaveGame_SaveCache:							strState = "ESaveGame_SaveCache"; break;
 	case C4JStorage::ESaveGame_ReconstructCache:					strState = "ESaveGame_ReconstructCache"; break;
 	}
-	
+
 	app.DebugPrintf("[printSaveState] GetSaveState == %s.\n", strState.c_str());
 #endif
 }
@@ -1156,7 +1156,7 @@ void CConsoleMinecraftApp::SaveDataTick()
 				{
 					app.DebugPrintf("[SaveDataTick] eSaveDataDeleteState_abort.\n");
 					StorageManager.CancelIncompleteOperation();
-				}	
+				}
 				else if (m_bSaveDataDeleteDialogState == eSaveDataDeleteState_continue)
 				{
 					app.DebugPrintf("[SaveDataTick] eSaveDataDeleteState_continue.\n");
@@ -1228,7 +1228,7 @@ void CConsoleMinecraftApp::Callback_SaveGameIncomplete(void *pParam, C4JStorage:
 
 int	CConsoleMinecraftApp::NoSaveSpaceReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	if(result==C4JStorage::EMessage_ResultAccept) 
+	if(result==C4JStorage::EMessage_ResultAccept)
 	{
 		int blocksRequired = (int)pParam;
 		if(blocksRequired > 0)
@@ -1256,7 +1256,7 @@ int CConsoleMinecraftApp::cbConfirmDeleteMessageBox(void *pParam, int iPad, cons
 
 	if (pClass != NULL && pClass->m_pSaveToDelete != NULL)
 	{
-		if (result == C4JStorage::EMessage_ResultDecline) 
+		if (result == C4JStorage::EMessage_ResultDecline)
 		{
 			pClass->m_bSaveDataDeleteDialogState = eSaveDataDeleteState_deleting;
 			C4JStorage::ESaveGameState eDeleteStatus = StorageManager.DeleteSaveData(pClass->m_pSaveToDelete, cbSaveDataDeleted, pClass);
@@ -1290,7 +1290,7 @@ void CConsoleMinecraftApp::initSaveIncompleteDialog(int spaceNeeded)
 
 	param.sysMsgParam->sysMsgType = SCE_SAVEDATA_DIALOG_SYSMSG_TYPE_NOSPACE_CONTINUABLE;
 	param.sysMsgParam->value = (SceInt32) spaceNeeded;
-	
+
 	SceInt32 ret = sceSaveDataDialogInit(&param);
 	if (ret == SCE_OK)
 	{
@@ -1376,13 +1376,13 @@ void CConsoleMinecraftApp::initSaveDataDeleteDialog()
 		// Start getting saves data to use when deleting.
 		if (StorageManager.ReturnSavesInfo() == NULL)
 		{
-			C4JStorage::ESaveGameState eSGIStatus 
-				= StorageManager.GetSavesInfo( 
+			C4JStorage::ESaveGameState eSGIStatus
+				= StorageManager.GetSavesInfo(
 					ProfileManager.GetPrimaryPad(),
-					NULL, 
-					this, 
+					NULL,
+					this,
 					"save"
-				); 
+				);
 		}
 
 		// Dim background because sony doesn't do that.
@@ -1414,7 +1414,7 @@ void CConsoleMinecraftApp::updateSaveDataDeleteDialog()
 		{
 			SceSaveDataDialogResult dialogResult;
 			ZeroMemory(&dialogResult, sizeof(SceSaveDataDialogResult));
-		
+
 			SceInt32 ret = sceSaveDataDialogGetResult(&dialogResult);
 			if (ret == SCE_OK)
 			{
@@ -1438,7 +1438,7 @@ void CConsoleMinecraftApp::updateSaveDataDeleteDialog()
 				{
 					SceAppUtilSaveDataSlotParam slotParam;
 					ret = sceAppUtilSaveDataSlotGetParam( dialogResult.slotId, &slotParam, NULL );
-					
+
 					if (ret == SCE_OK)
 					{
 						int saveindex = -1;
@@ -1469,12 +1469,12 @@ void CConsoleMinecraftApp::updateSaveDataDeleteDialog()
 						{
 							app.DebugPrintf("[SaveDataDeleteDialog] ERROR: PERFORMING DELETE OPERATION, pSavesDetails is null.\n");
 						}
-					
+
 						if (pSaveInfo != NULL)
 						{
 							app.DebugPrintf(
 								"[SaveDataDeleteDialog] User wishes to delete slot_%d:\n\t"
-								"4jsaveindex=%d, filename='%s', title='%s', subtitle='%s', size=%dKiB.\n", 
+								"4jsaveindex=%d, filename='%s', title='%s', subtitle='%s', size=%dKiB.\n",
 								dialogResult.slotId,
 								saveindex,
 								pSaveInfo->UTF8SaveFilename,
@@ -1490,7 +1490,7 @@ void CConsoleMinecraftApp::updateSaveDataDeleteDialog()
 							};
 
 							ui.RequestMessageBox(
-								IDS_TOOLTIPS_DELETESAVE, IDS_TEXT_DELETE_SAVE, 
+								IDS_TOOLTIPS_DELETESAVE, IDS_TEXT_DELETE_SAVE,
 								uiIDA, 2,
 								0,
 								&cbConfirmDeleteMessageBox, this,
@@ -1498,7 +1498,7 @@ void CConsoleMinecraftApp::updateSaveDataDeleteDialog()
 								);
 
 							m_bSaveDataDeleteDialogState = eSaveDataDeleteState_userConfirmation;
-					
+
 							m_pSaveToDelete = pSaveInfo;
 						}
 						else
@@ -1571,7 +1571,7 @@ void CConsoleMinecraftApp::getSaveDataDeleteDialogParam(SceSaveDataDialogParam *
 		{
 			SceAppUtilSaveDataSlotParam slotParam;
 			int ret = sceAppUtilSaveDataSlotGetParam( i, &slotParam, NULL );
-		
+
 			if (ret == SCE_OK)
 			{
 				SceAppUtilSaveDataSlot slot;
@@ -1584,7 +1584,7 @@ void CConsoleMinecraftApp::getSaveDataDeleteDialogParam(SceSaveDataDialogParam *
 				slots.push_back( slot );
 			}
 		}
-		
+
 		SceAppUtilSaveDataSlot *pSavesList = new SceAppUtilSaveDataSlot[slots.size()];
 
 		int slotIndex = 0;
@@ -1618,7 +1618,7 @@ void CConsoleMinecraftApp::getSaveDataDeleteDialogParam(SceSaveDataDialogParam *
 
 	listParam.listTitle = (const SceChar8 *) strPtr;
 	listParam.itemStyle = SCE_SAVEDATA_DIALOG_LIST_ITEM_STYLE_TITLE_SUBTITLE_DATE;
-	
+
 	baseParam->mode = SCE_SAVEDATA_DIALOG_MODE_LIST;
 	baseParam->dispType = SCE_SAVEDATA_DIALOG_TYPE_DELETE;
 	baseParam->listParam = &listParam;
@@ -1659,10 +1659,10 @@ int CConsoleMinecraftApp::cbSaveDataDeleted( void *pParam, const bool success )
 void CConsoleMinecraftApp::finishedDeletingSaves(bool bContinue)
 {
 	app.DebugPrintf( "[finishedDeletingSaves] %s.\n", (bContinue?"Continuing":"Aborting") );
-	
+
 	StorageManager.SetSaveDisabled(false);
 	LeaveSaveNotificationSection();
-	
+
 	StorageManager.ClearSaveError();
 	StorageManager.ClearOptionsSaveError();