Changeset 26662 for main/trunk/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.c

Timestamp:

2013-01-10T15:56:18+13:00 (11 years ago)

Author:

davidb

Message:

Support for cross-compilation added. This particular set of changes focus on flags that assist cross-compilation with JNI. Comparable set of changes to the mgpp ones. Note the additional type-casting (intptr_t)

File:

• main/trunk/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.c (modified) (1 diff)

main/trunk/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.c

@@ -18 +18 @@
  */
 
+#include <jni.h>
+
+#ifdef __MINGW32__
+
+// Cross compiling for Windows
+// Want the type definitions in *win32* version of jni_md.h but
+// this then leads to C-mangled style functions which we *don't*
+// want.  The following achieves this
+
+#undef JNIEXPORT
+#undef JNIIMPORT
+#undef JNICALL
+
+#define JNIEXPORT
+#define JNIIMPORT
+#define JNICALL
+#endif
 
 #include "MGWrapperImpl.h"
-#include <jni.h>
 #include "org_greenstone_mg_MGWrapper.h"
+
 
 #include "backend.h"