# HG changeset patch # User Michael Goffioul # Date 1356232593 0 # Node ID fe2cefaa772b70b866f00e9dec95a3c7e263c389 # Parent 48a75e6884ecc7ad04329e1b9c2dfa262f981d16 Replace JAVAPKG_API with OCTINTERP_API * ov-java.h: Replace all occurrences of JAVAPKG_API with OCTINTERP_API. diff -r 48a75e6884ec -r fe2cefaa772b libinterp/octave-value/ov-java.h --- a/libinterp/octave-value/ov-java.h Sun Dec 23 03:16:08 2012 +0000 +++ b/libinterp/octave-value/ov-java.h Sun Dec 23 03:16:33 2012 +0000 @@ -28,12 +28,6 @@ #include #include -#ifdef JAVAPKG_BUILD -# define JAVAPKG_API OCTAVE_EXPORT -#else -# define JAVAPKG_API OCTAVE_IMPORT -#endif - template class java_local_ref { @@ -89,33 +83,33 @@ typedef java_local_ref jdoubleArray_ref; typedef java_local_ref 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: