Changeset 35550 for main

Timestamp:

2021-10-12T10:35:42+13:00 (3 years ago)

Author:

davidb

Message:

On Windows 64-bit using VisualStudio it was found that malloc was not being explicitly externed, leading to the compiling thinking it returned an 'int' not a pointer to a memory location. The cascading affect of this was to result in binaries being produced that crashed when trying to do something as simple as call gdbm_open(). Fix is to explcilty specify #include <malloc.h>, coded in an 'autoconf' friendly way. Currently only the windows/autoconf.h explicitly defines HAVE_MALLOC to 1

Location:

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3

Files:

• systems.h (modified) (1 diff)
• windows/autoconf.h (modified) (1 diff)

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/systems.h

@@ -176 +176 @@
 #define STDERR_FILENO 2
 #endif
+
+/* Added in to assist with Windows 64-bit compilation */
+/* See not in windows/autoconf.h for more details     */
+#if HAVE_MALLOC
+#include <malloc.h>
+#endif

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/windows/autoconf.h

@@ -93 +93 @@
 /* Define to `long' if <sys/types.h> does not define. */
 #undef off_t
+
+
+/* 
+   The following below was added to assist with compiling up GDBM for
+   Greenstone on Windows 64-bit.  Nothing apparently was externing
+   malloc() resulting in it being seen as a method that returned an
+   'int'.  On a 64-bit OS 'int' is not a compatible datatype size for
+   something that is a pointer into memory (what malloc() actually
+   returned).  On 32-bit Windows we must have been getting away with
+   this, as int at 4 bytes is the same size as used for pointers.
+   
+
+   Compiling using Visual Studio on 64-bit Windows generated a warning
+   about the typcast truncating the value, but (being only a warning)
+   proceeded anyway.  However, this subsequently leads to GDBM compiled
+   code crashing when invoked by Greenstone (either as compiled up
+   binaries such as 'db2txt' or through the Greenstone3 runtime JNI
+   calls.
+*/
+
+/* Define to 1 if you have malloc header files. */
+#define HAVE_MALLOC 1