File squirrel-ptr_conversion.patch of Package squirrel

Overview Repositories Revisions Requests Users Attributes Meta

File squirrel-ptr_conversion.patch of Package squirrel (Revision dcd74965362f6152df1369fc5ddd4dc4)

Currently displaying revision dcd74965362f6152df1369fc5ddd4dc4 , Show latest

Index: include/squirrel.h
===================================================================
--- include/squirrel.h.orig	2011-11-10 13:28:17.207798938 +0100
+++ include/squirrel.h	2011-11-10 14:22:11.190332653 +0100
@@ -24,6 +24,12 @@ THE SOFTWARE.
 #define _SQUIRREL_H_
 
 #ifdef __cplusplus
+#include <cstdint>
+#else
+#include <stdint.h>
+#endif
+
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -38,24 +44,23 @@ extern "C" {
 #endif
 
 #ifdef _SQ64
-
-#ifdef _MSC_VER
-typedef __int64 SQInteger;
-typedef unsigned __int64 SQUnsignedInteger;
-typedef unsigned __int64 SQHash; /*should be the same size of a pointer*/
-#else
-typedef long long SQInteger;
-typedef unsigned long long SQUnsignedInteger;
-typedef unsigned long long SQHash; /*should be the same size of a pointer*/
-#endif
+  #ifdef _MSC_VER
+    typedef __int64 SQInteger;
+    typedef unsigned __int64 SQUnsignedInteger;
+    typedef unsigned __int64 SQHash; /*should be the same size of a pointer*/
+  #else
+    typedef int64_t SQInteger;
+    typedef uint64_t SQUnsignedInteger;
+    typedef uintptr_t SQHash; /*should be the same size of a pointer*/
+  #endif
 typedef int SQInt32; 
-typedef unsigned int SQUnsignedInteger32;
+typedef uint32_t SQUnsignedInteger32;
 #else 
-typedef int SQInteger;
-typedef int SQInt32; /*must be 32 bits(also on 64bits processors)*/
-typedef unsigned int SQUnsignedInteger32; /*must be 32 bits(also on 64bits processors)*/
-typedef unsigned int SQUnsignedInteger;
-typedef unsigned int SQHash; /*should be the same size of a pointer*/
+    typedef int SQInteger;
+    typedef int32_t SQInt32; /*must be 32 bits(also on 64bits processors)*/
+    typedef uint32_t SQUnsignedInteger32; /*must be 32 bits(also on 64bits processors)*/
+    typedef uintptr_t SQUnsignedInteger;
+    typedef uintptr_t SQHash; /*should be the same size of a pointer*/
 #endif
 
 
@@ -169,11 +174,12 @@ typedef char SQChar;
 
 #ifdef _SQ64
 #define _PRINT_INT_PREC _SC("ll")
-#define _PRINT_INT_FMT _SC("%lld")
 #else
 #define _PRINT_INT_FMT _SC("%d")
 #endif
 
+#define _PRINT_INT_FMT _SC("%lld")
+
 #define SQUIRREL_VERSION	_SC("Squirrel 3.0 stable")
 #define SQUIRREL_COPYRIGHT	_SC("Copyright (C) 2003-2011 Alberto Demichelis")
 #define SQUIRREL_AUTHOR		_SC("Alberto Demichelis")
Index: squirrel/sqobject.h
===================================================================
--- squirrel/sqobject.h.orig	2011-11-10 13:28:17.217798801 +0100
+++ squirrel/sqobject.h	2011-11-10 13:28:20.090759512 +0100
@@ -266,7 +266,7 @@ struct SQObjectPtr : public SQObject
 	{
 		__Release(_type ,_unVal);
 		_type = OT_NULL;
-		_unVal.raw = NULL;
+		_unVal.raw = static_cast<uintptr_t>(NULL);
 	}
 	private:
 		SQObjectPtr(const SQChar *){} //safety

Places

File squirrel-ptr_conversion.patch of Package squirrel (Revision dcd74965362f6152df1369fc5ddd4dc4)

Places