[libbluray-devel] Remove useless bdj_private.h

[hpi1]

libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Mon Nov 17 12:05:06 2014 +0200| [1f277444654ef272682fcea6e2e5335a3f86f6f7] | committer: hpi1

Remove useless bdj_private.h

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

 src/Makefile.am                 |    1 -
 src/libbluray/bdj/bdj.c         |    5 ++++-
 src/libbluray/bdj/bdj_private.h |   37 -------------------------------------
 3 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index c8def8a..b262117 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -141,7 +141,6 @@ $(top_builddir)/src/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar: all-local
 
 libbluray_la_SOURCES += \
 	libbluray/bdj/bdj.h \
-	libbluray/bdj/bdj_private.h \
 	libbluray/bdj/bdj.c \
 	libbluray/bdj/bdjo_data.h \
 	libbluray/bdj/bdjo_parse.h \
diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
index 921d1cf..2c0bd1d 100644
--- a/src/libbluray/bdj/bdj.c
+++ b/src/libbluray/bdj/bdj.c
@@ -24,7 +24,6 @@
 
 #include "bdj.h"
 
-#include "bdj_private.h"
 #include "native/register_native.h"
 
 #include "file/dirs.h"
@@ -50,6 +49,10 @@
 #define BDJ_JARFILE "libbluray-j2se-" VERSION ".jar"
 #endif
 
+struct bdjava_s {
+    void   *h_libjvm;
+    JavaVM *jvm;
+};
 
 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/bdj_private.h b/src/libbluray/bdj/bdj_private.h
deleted file mode 100644
index 6bf253f..0000000
--- a/src/libbluray/bdj/bdj_private.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file is part of libbluray
- * Copyright (C) 2010  William Hahne
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#ifndef BDJ_PRIVATE_H_
-#define BDJ_PRIVATE_H_
-
-#include "bdj.h"
-
-#include <jni.h>
-
-struct bluray;
-
-struct bdjava_s {
-    // JVM library
-    void *h_libjvm;
-
-    // JNI
-    JavaVM* jvm;
-};
-
-#endif