Changeset 35556 for main/trunk

Timestamp:

2021-10-12T16:45:01+13:00 (3 years ago)

Author:

davidb

Message:

Changes/fixes after testing on Linux 32-bit

File:

• main/trunk/greenstone3/src/packages/javagdbm/jni/gdbmjava.c (modified) (2 diffs)

main/trunk/greenstone3/src/packages/javagdbm/jni/gdbmjava.c

@@ -124 +124 @@
 
 #    else
-#      error Windows OS neither 32-bit nor 64-bit.  SIZEOF_VOID_P not specified
+#error "VisualStudio C compile neither 32-bit nor 64-bit.  SIZEOF_VOID_P not specified"
 #    endif
 
-#  else /* Presumably Unix */
-#    if defined( __ILP32 )     /* i.e., int, long and pointer are all 32-bits */
+#  elif defined ( __GNUC__ ) /* Presumably Unix or Unix-like platform */
+
+#    if defined( __i386__ ) /* i.e., ILP32: int, long and pointer are all 32-bits */
 #      define SIZEOF_VOID_P 4
 
-#    elif defined( __LP64 )    /* i.e., long, and pointer are both 64-bits */
+#    elif defined( __X86_64__ )    /* i.e., LP64:  long, and pointer are both 64-bits */
 #      define SIZEOF_VOID_P 8
 
 #    else
-#      error Compiler's 'sizeof' model not matched as either IILP32 or LP64.  SIZEOF_VOID_P not specified
+#error "GCC 'sizeof' model not matched as either ILP32 (32-bit) or LP64 (64-bit).  SIZEOF_VOID_P not specified"
 #    endif
+
+#  else
+#error "Unrecognized compiler: SIZEOF_LONG not specified"
+
 #  endif
 #endif
@@ -151 +156 @@
 
 #    else
-#      error Windows OS neither 32-bit nor 64-bit.  SIZEOF_LONG not specified
+#error "VisualStudio C compiler neither 32-bit nor 64-bit.  SIZEOF_LONG not specified"
 #    endif
 
-#  else /* Presumably Unix */
-#    if defined( __ILP32 )
+#  elif __GNUC__  /* Presumably Unix or Unix-like platform */
+#    if defined( __i386__ )
 #      define SIZEOF_LONG 4
 
-#    elif defined( __LP64 )
+#    elif defined( __X86_64__ )
 #      define SIZEOF_LONG 8
 
 #    else
-#      error Compiler's 'sizeof' model not matched as either IILP32 or LP64.  SIZEOF_LONG not specified
+#error "GCC 'sizeof' model not matched as either ILP32 (32-bit) or LP64 (64-bit_.  SIZEOF_LONG not specified"
 #    endif
+
+#  else
+#error "Unrecognized compiler: SIZEOF_LONG not specified"
 #  endif
 #endif