[libbluray-devel] jni: remove c++ stuff (fixes build with c++ compiler)

hpi1 git at videolan.org
Wed Feb 18 10:54:33 CET 2015


libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Wed Feb 18 11:52:53 2015 +0200| [b9191377ebcc90c32e9502d900a617cbd2929d16] | committer: hpi1

jni: remove c++ stuff (fixes build with c++ compiler)

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=b9191377ebcc90c32e9502d900a617cbd2929d16
---

 jni/jni.h |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/jni/jni.h b/jni/jni.h
index 098640d..c416486 100644
--- a/jni/jni.h
+++ b/jni/jni.h
@@ -61,7 +61,7 @@ typedef double		jdouble;
 
 typedef jint            jsize;
 
-#ifdef __cplusplus
+#if 0 /*ifdef __cplusplus*/
 
 class _jobject {};
 class _jclass : public _jobject {};
@@ -184,7 +184,7 @@ struct JNINativeInterface_;
 
 struct JNIEnv_;
 
-#ifdef __cplusplus
+#if 0 /*ifdef __cplusplus*/
 typedef JNIEnv_ JNIEnv;
 #else
 typedef const struct JNINativeInterface_ *JNIEnv;
@@ -198,7 +198,7 @@ struct JNIInvokeInterface_;
 
 struct JavaVM_;
 
-#ifdef __cplusplus
+#if 0 /*ifdef __cplusplus*/
 typedef JavaVM_ JavaVM;
 #else
 typedef const struct JNIInvokeInterface_ *JavaVM;
@@ -769,7 +769,7 @@ struct JNINativeInterface_ {
 
 struct JNIEnv_ {
     const struct JNINativeInterface_ *functions;
-#ifdef __cplusplus
+#if 0/*ifdef __cplusplus*/
 
     jint GetVersion() {
         return functions->GetVersion(this);
@@ -1918,7 +1918,7 @@ struct JNIInvokeInterface_ {
 
 struct JavaVM_ {
     const struct JNIInvokeInterface_ *functions;
-#ifdef __cplusplus
+#if 0/*ifdef __cplusplus*/
 
     jint DestroyJavaVM() {
         return functions->DestroyJavaVM(this);



More information about the libbluray-devel mailing list