Changeset 26674 for main/trunk/greenstone3/src/packages/javagdbm/jni/gdbmjava.c

Timestamp:

2013-01-10T16:30:25+13:00 (10 years ago)

Author:

davidb

Message:

Changes to support cross-compiling using mingw under Linux to produce Windows native binaries/dlls. See comment at the top of the file for more details

File:

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

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

@@ -32 +32 @@
 #include <string.h>
 
-#if defined (__WIN32__)
+#ifdef __MINGW32__
+#define MSDOS
+#endif
+
+#if defined (_MSC_VER)
 #include <gdbmdefs.h>
 #include <gdbmerrno.h>
@@ -42 +46 @@
 
 #include <jni.h>
+
+#ifdef __MINGW32__
+
+/* (Cross) compiling for Windows Want the type definitions in *win32*
+   version of jni_md.h but with the mingw c compiler this then leads
+   to C-mangled style functions (param/num args encoded in function
+   name) which we *don't* want.  The following achieves this */
+
+#undef JNIEXPORT
+#undef JNIIMPORT
+#undef JNICALL
+
+#define JNIEXPORT
+#define JNIIMPORT
+#define JNICALL
+#endif
 
 #include <GdbmFile.h>