libbluray | branch: master | hpi1 <[email protected]> | Tue Sep 30 13:28:32 2014 +0300| [14302784fd210ab4633d5e79b1ab69f2fb349d1b] | committer: hpi1
Move BDJ_JARFILE to bdj.c BDJ_JARFILE isn't used anywhere else > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=14302784fd210ab4633d5e79b1ab69f2fb349d1b --- src/libbluray/bdj/bdj.c | 8 +++++++- src/libbluray/bdj/common.h | 5 ----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c index 0aa4318..f8824b4 100644 --- a/src/libbluray/bdj/bdj.c +++ b/src/libbluray/bdj/bdj.c @@ -27,7 +27,6 @@ #include "bdj_private.h" #include "bdjo_parser.h" #include "bdj_util.h" -#include "common.h" #include "libbluray/register.h" #include "file/dirs.h" #include "file/dl.h" @@ -47,6 +46,13 @@ #include <winreg.h> #endif +#ifdef HAVE_BDJ_J2ME +#define BDJ_JARFILE "libbluray-j2me-" VERSION ".jar" +#else +#define BDJ_JARFILE "libbluray-j2se-" VERSION ".jar" +#endif + + typedef jint (JNICALL * fptr_JNI_CreateJavaVM) (JavaVM **pvm, void **penv,void *args); typedef jint (JNICALL * fptr_JNI_GetCreatedJavaVMs) (JavaVM **vmBuf, jsize bufLen, jsize *nVMs); diff --git a/src/libbluray/bdj/common.h b/src/libbluray/bdj/common.h index 092d7aa..b930510 100644 --- a/src/libbluray/bdj/common.h +++ b/src/libbluray/bdj/common.h @@ -22,11 +22,6 @@ #include "config.h" -#ifdef HAVE_BDJ_J2ME -#define BDJ_JARFILE "libbluray-j2me-" VERSION ".jar" -#else -#define BDJ_JARFILE "libbluray-j2se-" VERSION ".jar" -#endif #define BDJ_BDJO_PATH "/BDMV/BDJO" #endif /* BDJ_COMMON_H_ */ _______________________________________________ libbluray-devel mailing list [email protected] https://mailman.videolan.org/listinfo/libbluray-devel
