define [U]LONG32 as int [#7]

stsp · Aug 16, 2024 · 3f740cc · 3f740cc
1 parent c510f54
commit 3f740cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/include/coff.h b/include/coff.h
@@ -8,12 +8,11 @@
 /* the following are needed when cross compiling hostbin exes */
 #ifndef _DJ_DEFINED_NATIVE_TYPES
 #define _DJ_DEFINED_NATIVE_TYPES
-#ifdef  _LP64			/* Note: win64 is LLP64 */
+#ifndef  _ILP64			/* Note: win64 is LLP64 */
 # define LONG32  int
 # define ULONG32 unsigned int
 #else
-# define LONG32  long
-# define ULONG32 unsigned long
+# error ILP64 not supported
 #endif
 /* make sure it is 32 bits */
 typedef int _DJCHK_LONG32[(sizeof(LONG32) == 4)*3 - 1];

diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h
@@ -14,12 +14,11 @@
 #endif
 #endif
 
-#ifdef  _LP64			/* Note: win64 is LLP64 */
+#ifndef  _ILP64			/* Note: win64 is LLP64 */
 # define LONG32  int
 # define ULONG32 unsigned int
 #else
-# define LONG32  long
-# define ULONG32 unsigned long
+# error ILP64 not supported
 #endif
 
 #undef __P

diff --git a/include/sys/dxe.h b/include/sys/dxe.h
@@ -16,12 +16,11 @@
 /* the following are needed when cross compiling hostbin exes */
 #ifndef _DJ_DEFINED_NATIVE_TYPES
 #define _DJ_DEFINED_NATIVE_TYPES
-#ifdef  _LP64			/* Note: win64 is LLP64 */
+#ifndef  _ILP64			/* Note: win64 is LLP64 */
 # define LONG32  int
 # define ULONG32 unsigned int
 #else
-# define LONG32  long
-# define ULONG32 unsigned long
+# error ILP64 not supported
 #endif
 /* make sure it is 32 bits */
 typedef int _DJCHK_LONG32[(sizeof(LONG32) == 4)*3 - 1];