JORTE: update header files

Remove defines of UINT32__MIN and UINT32__MAX, because they are in the
<stdint.h> and UINT32__MAX is computed in a wrong way.

Make the HAVE_CONFIG_H hack Android specific and add extern "C" for C++
compatibility to onLoad.h

diff --git a/orte/include/jorte/jorte.h b/orte/include/jorte/jorte.h
index 9c7a5e339a253ff05c2060b0aba8f897effca471..73c51fad1d290fffd5c69af6bbca3a6c853e440d 100644 (file)
--- a/orte/include/jorte/jorte.h
+++ b/orte/include/jorte/jorte.h
@@ -42,7 +42,6 @@ extern "C" {
 
 // auto-generated headers by JNI
 #include "org_ocera_orte_tools_Conversions.h"
-#include "org_ocera_orte_Domain.h"
 #include "org_ocera_orte_DomainEvents.h"
 #include "org_ocera_orte_DomainProp.h"
 #include "org_ocera_orte_tools_GetORTEConstant.h"

diff --git a/orte/include/jorte/jorte_typedefs_defines.h b/orte/include/jorte/jorte_typedefs_defines.h
index 62fc85dd77830e00c34e48b22395274f39341995..e6f50fa56c9180f3aacc789c8141365d4fbed8f2 100644 (file)
--- a/orte/include/jorte/jorte_typedefs_defines.h
+++ b/orte/include/jorte/jorte_typedefs_defines.h
@@ -21,10 +21,6 @@
   */
 
 
-# define UINT32__MIN 0
-# define UINT32__MAX (2^32 -1)
-
-
 typedef struct
 {
  JavaVM        *jvm;

diff --git a/orte/include/jorte/onLoad.h b/orte/include/jorte/onLoad.h
index 76802393dff89d52c36631b62f0c92f4b663f597..77524db1e6caf99e0bc79b43a3b830082b992deb 100644 (file)
--- a/orte/include/jorte/onLoad.h
+++ b/orte/include/jorte/onLoad.h
@@ -1,8 +1,14 @@
+#include <jni.h>
+
 #ifndef IncludedOnLoad
 #define IncludedOnLoad
-
-#include <jni.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 jclass findClass(JNIEnv *env, const char* name);
 
+#ifdef __cplusplus
+}
+#endif
 #endif

diff --git a/orte/include/orte_headers.h b/orte/include/orte_headers.h
index 7583140273d8ec06f517480269251e073698aec8..c64577b228e11f5f7c7808ef63b9e5319007d9ac 100644 (file)
--- a/orte/include/orte_headers.h
+++ b/orte/include/orte_headers.h
@@ -29,12 +29,15 @@
 
 #ifndef _ORTE_ALL_H
 #define _ORTE_ALL_H
-#define HAVE_CONFIG_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#ifdef __ANDROID__
+  #define HAVE_CONFIG_H
+#endif
+
 #if defined _MSC_VER
   #include "orte/ew_types.h"
 #elif defined(HAVE_CONFIG_H) || defined(OMK_FOR_USER)  || defined(OMK_FOR_KERNEL)