Mercurial > hg > octave-lyh

changeset 15837:fe2cefaa772b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace JAVAPKG_API with OCTINTERP_API * ov-java.h: Replace all occurrences of JAVAPKG_API with OCTINTERP_API.
author Michael Goffioul <michael.goffioul@gmail.com>
date Sun, 23 Dec 2012 03:16:33 +0000
parents 48a75e6884ec
children 009984ecf419 9a210f7fe62e
files libinterp/octave-value/ov-java.h
diffstat 1 files changed, 10 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.h
+++ b/libinterp/octave-value/ov-java.h
@@ -28,12 +28,6 @@
 #include <oct-obj.h>
 #include <ov.h>
 
-#ifdef JAVAPKG_BUILD
-# define JAVAPKG_API OCTAVE_EXPORT
-#else
-# define JAVAPKG_API OCTAVE_IMPORT
-#endif
-
 template <class T>
 class java_local_ref
 {
@@ -89,33 +83,33 @@
 typedef java_local_ref<jdoubleArray> jdoubleArray_ref;
 typedef java_local_ref<jthrowable> jthrowable_ref;
 
-extern JAVAPKG_API std::string
+extern OCTINTERP_API std::string
 jstring_to_string (JNIEnv* jni_env, jstring s);
 
-extern JAVAPKG_API std::string
+extern OCTINTERP_API std::string
 jstring_to_string (JNIEnv* jni_env, jobject obj);
 
-extern JAVAPKG_API octave_value
+extern OCTINTERP_API octave_value
 box (JNIEnv* jni_env, jobject jobj, jclass jcls = 0);
 
-extern JAVAPKG_API octave_value
+extern OCTINTERP_API octave_value
 box_more (JNIEnv* jni_env, jobject jobj, jclass jcls = 0);
 
-extern JAVAPKG_API int
+extern OCTINTERP_API int
 unbox (JNIEnv* jni_env, const octave_value& val, jobject_ref& jobj,
        jclass_ref& jcls);
 
-extern JAVAPKG_API int
+extern OCTINTERP_API int
 unbox (JNIEnv* jni_env, const octave_value_list& args,
        jobjectArray_ref& jobjs, jobjectArray_ref& jclss);
 
-extern JAVAPKG_API bool Vjava_matrix_autoconversion;
+extern OCTINTERP_API bool Vjava_matrix_autoconversion;
 
-extern JAVAPKG_API bool Vjava_unsigned_autoconversion;
+extern OCTINTERP_API bool Vjava_unsigned_autoconversion;
 
-extern JAVAPKG_API bool Vdebug_java;
+extern OCTINTERP_API bool Vdebug_java;
 
-class JAVAPKG_API octave_java : public octave_base_value
+class OCTINTERP_API octave_java : public octave_base_value
 {
 public: