[libbluray-devel] Cosmetics
hpi1
git at videolan.org
Fri May 12 13:51:29 CEST 2017
libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Fri May 12 14:04:13 2017 +0300| [784299e74a995175cc895e5ff4b376136350ecef] | committer: hpi1
Cosmetics
> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=784299e74a995175cc895e5ff4b376136350ecef
---
src/libbluray/bdj/bdj.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
index f6f4155c..67767bd5 100644
--- a/src/libbluray/bdj/bdj.c
+++ b/src/libbluray/bdj/bdj.c
@@ -345,11 +345,11 @@ static void *_load_jvm(const char **p_java_home)
# ifdef _WIN32
static const char * const jvm_path[] = {NULL, JDK_HOME};
static const char * const jvm_dir[] = {"bin"};
- static const char jvm_lib[] = "cvmi";
+ static const char jvm_lib[] = "cvmi";
# else
static const char * const jvm_path[] = {NULL, JDK_HOME, "/opt/PhoneME"};
static const char * const jvm_dir[] = {"bin"};
- static const char jvm_lib[] = "libcvm";
+ static const char jvm_lib[] = "libcvm";
# endif
#else /* HAVE_BDJ_J2ME */
# ifdef _WIN32
@@ -359,24 +359,25 @@ static void *_load_jvm(const char **p_java_home)
"jre\\bin\\client",
"bin\\client",
};
- static const char jvm_lib[] = "jvm";
+ static const char jvm_lib[] = "jvm";
# else
# ifdef __APPLE__
static const char * const jvm_path[] = {NULL, JDK_HOME};
static const char * const jvm_dir[] = {"jre/lib/server"};
# else
- static const char * const jvm_path[] = {NULL, JDK_HOME,
- "/usr/lib/jvm/default-java",
- "/usr/lib/jvm/default",
- "/usr/lib/jvm/",
- "/etc/java-config-2/current-system-vm",
- "/usr/lib/jvm/java-7-openjdk",
- "/usr/lib/jvm/java-8-openjdk",
- "/usr/lib/jvm/java-6-openjdk",
+ static const char * const jvm_path[] = {NULL,
+ JDK_HOME,
+ "/usr/lib/jvm/default-java",
+ "/usr/lib/jvm/default",
+ "/usr/lib/jvm/",
+ "/etc/java-config-2/current-system-vm",
+ "/usr/lib/jvm/java-7-openjdk",
+ "/usr/lib/jvm/java-8-openjdk",
+ "/usr/lib/jvm/java-6-openjdk",
};
static const char * const jvm_dir[] = {"jre/lib/" JAVA_ARCH "/server"};
# endif
- static const char jvm_lib[] = "libjvm";
+ static const char jvm_lib[] = "libjvm";
# endif
#endif
const unsigned num_jvm_dir = sizeof(jvm_dir) / sizeof(jvm_dir[0]);
More information about the libbluray-devel
mailing list