Просмотр исходного кода

Move the definition of SQ_MAX_INT, SQ_MIN_INT to sqconfig.h

mingodad 8 лет назад
Родитель
Сommit
cbf4b0afe7
3 измененных файлов с 17 добавлено и 72 удалено
  1. 17 2
      SquiLu/include/sqconfig.h
  2. 0 58
      SquiLu/include/squirrel.h
  3. 0 12
      SquiLu/sqstdlib/sqstdmath.cpp

+ 17 - 2
SquiLu/include/sqconfig.h

@@ -3,12 +3,23 @@
 
 typedef short SQInt16;
 typedef unsigned short SQUnsignedInt16;
+#ifdef _MSC_VER
+    #define SQ_INT_MAX _I64_MAX
+    #define SQ_INT_MIN _I64_MIN
+#else
+    #define SQ_INT_MAX LLONG_MAX
+    #define SQ_INT_MIN LLONG_MIN
+#endif
 
 #ifdef _MSC_VER
+#define SQ_INT_MAX _I64_MAX
+#define SQ_INT_MIN _I64_MIN
 typedef __int64 SQInteger;
 typedef unsigned __int64 SQUnsignedInteger;
 typedef unsigned __int64 SQHash; /*should be the same size of a pointer*/
 #else
+#define SQ_INT_MAX LLONG_MAX
+#define SQ_INT_MIN LLONG_MIN
 typedef long long SQInteger;
 typedef unsigned long long SQUnsignedInteger;
 typedef unsigned long long SQHash; /*should be the same size of a pointer*/
@@ -16,17 +27,21 @@ typedef unsigned long long SQHash; /*should be the same size of a pointer*/
 typedef int SQInt32;
 typedef unsigned int SQUnsignedInteger32;
 #else
+#define SQ_INT_MAX INT_MAX
+#define SQ_INT_MIN INT_MIN
 typedef int SQInteger;
+typedef unsigned int SQUnsignedInteger;
 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 short SQInt16;
 typedef unsigned short SQUnsignedInt16;
 typedef unsigned int /*ptrdiff_t*/ SQHash; /*should be the same size of a pointer*/
 #endif
 
 
-#ifdef SQUSEDOUBLE
+#ifdef SQUSEDECIMAL64
+typedef _Decimal64 SQFloat;
+#elif defined(SQUSEDOUBLE)
 typedef double SQFloat;
 #else
 typedef float SQFloat;

+ 0 - 58
SquiLu/include/squirrel.h

@@ -39,64 +39,6 @@ extern "C" {
 #endif
 #endif
 
-#ifdef _SQ64
-
-typedef short SQInt16;
-typedef unsigned short SQUnsignedInt16;
-
-#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
-typedef int SQInt32;
-typedef unsigned int SQUnsignedInteger32;
-#else
-typedef int SQInteger;
-typedef unsigned int SQUnsignedInteger;
-typedef int SQInt32; /*must be 32 bits(also on 64bits processors)*/
-typedef unsigned int SQUnsignedInteger32; /*must be 32 bits(also on 64bits processors)*/
-typedef short SQInt16;
-typedef unsigned short SQUnsignedInt16;
-typedef unsigned int /*ptrdiff_t*/ SQHash; /*should be the same size of a pointer*/
-#endif
-
-
-#ifdef SQUSEDECIMAL64
-typedef _Decimal64 SQFloat;
-#elif defined(SQUSEDOUBLE)
-typedef double SQFloat;
-#else
-typedef float SQFloat;
-#endif
-
-#if defined(SQUSEDOUBLE) && !defined(_SQ64) || !defined(SQUSEDOUBLE) && defined(_SQ64)
-#ifdef _MSC_VER
-typedef __int64 SQRawObjectVal; //must be 64bits
-#else
-typedef long long SQRawObjectVal; //must be 64bits
-#endif
-#define SQ_OBJECT_RAWINIT() { _unVal.raw = 0; }
-#else
-typedef SQUnsignedInteger SQRawObjectVal; //is 32 bits on 32 bits builds and 64 bits otherwise
-#define SQ_OBJECT_RAWINIT()
-#endif
-
-#ifndef SQ_ALIGNMENT // SQ_ALIGNMENT shall be less than or equal to SQ_MALLOC alignments, and its value shall be power of 2.
-#if defined(SQUSEDOUBLE) || defined(_SQ64)
-#define SQ_ALIGNMENT 8
-#else
-#define SQ_ALIGNMENT 4
-#endif
-#endif
-
-typedef void* SQUserPointer;
-typedef SQUnsignedInteger SQBool;
-typedef SQInteger SQRESULT;
 
 #define SQTrue	(1)
 #define SQFalse	(0)

+ 0 - 12
SquiLu/sqstdlib/sqstdmath.cpp

@@ -9,18 +9,6 @@
 #define M_PI (3.14159265358979323846)
 #endif
 
-#ifdef _SQ64
-#ifdef _MSC_VER
-    #define SQ_INT_MAX _I64_MAX
-    #define SQ_INT_MIN _I64_MIN
-#else
-    #define SQ_INT_MAX LLONG_MAX
-    #define SQ_INT_MIN LLONG_MIN
-#endif
-#else
-#define SQ_INT_MAX INT_MAX
-#define SQ_INT_MIN INT_MIN
-#endif // _SQ64
 
 #define SINGLE_ARG_FUNC(_funcname) static SQRESULT math_##_funcname(HSQUIRRELVM v){ \
 	SQFloat f; \