Explorar el Código

Fixed typo _WIN64 instead of __WIN64

This is one of these highly embarassing typos I completly missed for a
long time.
vurtun hace 8 años
padre
commit
f5447a8406
Se han modificado 2 ficheros con 8 adiciones y 7 borrados
  1. 1 0
      CHANGELOG.md
  2. 7 7
      nuklear.h

+ 1 - 0
CHANGELOG.md

@@ -11,6 +11,7 @@
 
 
 Changes:
 Changes:
 --------
 --------
+- 2017/01/24 (1.32.3) - Fixed wrong define for basic type definitions for windows
 - 2017/01/21 (1.32.2) - Fixed input capture from hidden or closed windows
 - 2017/01/21 (1.32.2) - Fixed input capture from hidden or closed windows
 - 2017/01/21 (1.32.1) - Fixed slider behavior and drawing
 - 2017/01/21 (1.32.1) - Fixed slider behavior and drawing
 - 2017/01/13 (1.32.0) - Added flag to put scaler into the bottom left corner
 - 2017/01/13 (1.32.0) - Added flag to put scaler into the bottom left corner

+ 7 - 7
nuklear.h

@@ -356,10 +356,10 @@ extern "C" {
     #endif
     #endif
   #endif
   #endif
   #ifndef NK_SIZE_TYPE
   #ifndef NK_SIZE_TYPE
-    #if (defined(__WIN32) || defined(WIN32)) && defined(_MSC_VER)
-      #define NK_SIZE_TYPE __int32
-    #elif defined(__WIN64) && defined(_MSC_VER)
-      #define NK_SIZE_TYPE __int64
+    #if defined(_WIN64) && defined(_MSC_VER)
+      #define NK_SIZE_TYPE unsigned __int64
+    #elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)
+      #define NK_SIZE_TYPE unsigned __int32
     #elif defined(__GNUC__) || defined(__clang__)
     #elif defined(__GNUC__) || defined(__clang__)
       #if defined(__x86_64__) || defined(__ppc64__)
       #if defined(__x86_64__) || defined(__ppc64__)
         #define NK_SIZE_TYPE unsigned long
         #define NK_SIZE_TYPE unsigned long
@@ -371,10 +371,10 @@ extern "C" {
     #endif
     #endif
   #endif
   #endif
   #ifndef NK_POINTER_TYPE
   #ifndef NK_POINTER_TYPE
-    #if (defined(__WIN32) || defined(WIN32)) && defined(_MSC_VER)
-      #define NK_POINTER_TYPE unsigned __int32
-    #elif defined(__WIN64) && defined(_MSC_VER)
+    #if defined(_WIN64) && defined(_MSC_VER)
       #define NK_POINTER_TYPE unsigned __int64
       #define NK_POINTER_TYPE unsigned __int64
+    #elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)
+      #define NK_POINTER_TYPE unsigned __int32
     #elif defined(__GNUC__) || defined(__clang__)
     #elif defined(__GNUC__) || defined(__clang__)
       #if defined(__x86_64__) || defined(__ppc64__)
       #if defined(__x86_64__) || defined(__ppc64__)
         #define NK_POINTER_TYPE unsigned long
         #define NK_POINTER_TYPE unsigned long