[libbluray-devel] move native helper functions to native/

[hpi1]

libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Tue Oct 28 12:22:21 2014 +0200| [10e52a55ee6f0ea90a27a1c76c2d9842db8e562c] | committer: hpi1

move native helper functions to native/

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

 src/Makefile.am                                   |    6 +++---
 src/libbluray/bdj/native/bdjo.c                   |    3 ++-
 src/libbluray/bdj/native/org_videolan_Libbluray.c |    2 +-
 src/libbluray/bdj/{bdj_util.c => native/util.c}   |    4 +++-
 src/libbluray/bdj/{bdj_util.h => native/util.h}   |    1 -
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 6c8db27..1c4859c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -142,8 +142,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_util.h \
-	libbluray/bdj/bdj_util.c \
 	libbluray/bdj/bdj.c \
 	libbluray/bdj/bdjo_data.h \
 	libbluray/bdj/bdjo_parse.h \
@@ -159,7 +157,9 @@ libbluray_la_SOURCES += \
 	libbluray/bdj/native/org_videolan_Logger.h \
 	libbluray/bdj/native/org_videolan_Logger.c \
 	libbluray/bdj/native/register_native.h \
-	libbluray/bdj/native/register_native.c
+	libbluray/bdj/native/register_native.c \
+	libbluray/bdj/native/util.h \
+	libbluray/bdj/native/util.c
 
 AM_CFLAGS += $(BDJAVA_CFLAGS)
 
diff --git a/src/libbluray/bdj/native/bdjo.c b/src/libbluray/bdj/native/bdjo.c
index dcfbf16..3d34d61 100644
--- a/src/libbluray/bdj/native/bdjo.c
+++ b/src/libbluray/bdj/native/bdjo.c
@@ -19,9 +19,10 @@
 
 #include "bdjo.h"
 
+#include "util.h"
+
 #include "libbluray/bdj/bdjo_data.h"
 #include "libbluray/bdj/bdjo_parse.h"
-#include "libbluray/bdj/bdj_util.h"
 
 #include "util/logging.h"
 
diff --git a/src/libbluray/bdj/native/org_videolan_Libbluray.c b/src/libbluray/bdj/native/org_videolan_Libbluray.c
index ad51bdd..a675c9e 100644
--- a/src/libbluray/bdj/native/org_videolan_Libbluray.c
+++ b/src/libbluray/bdj/native/org_videolan_Libbluray.c
@@ -23,10 +23,10 @@
 #endif
 
 #include "bdjo.h"
+#include "util.h"
 
 #include "libbluray/bdj/bdj.h"
 #include "libbluray/bdj/bdj_private.h"
-#include "libbluray/bdj/bdj_util.h"
 
 #include "libbluray/bluray.h"
 #include "libbluray/bluray_internal.h"
diff --git a/src/libbluray/bdj/bdj_util.c b/src/libbluray/bdj/native/util.c
similarity index 97%
rename from src/libbluray/bdj/bdj_util.c
rename to src/libbluray/bdj/native/util.c
index 71eac26..c4d8331 100644
--- a/src/libbluray/bdj/bdj_util.c
+++ b/src/libbluray/bdj/native/util.c
@@ -18,9 +18,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#include "util.h"
+
 #include "util/logging.h"
 
-#include "bdj_util.h"
+#include <stdarg.h>
 
 jobject bdj_make_object(JNIEnv* env, const char* name, const char* sig, ...)
 {
diff --git a/src/libbluray/bdj/bdj_util.h b/src/libbluray/bdj/native/util.h
similarity index 98%
rename from src/libbluray/bdj/bdj_util.h
rename to src/libbluray/bdj/native/util.h
index 01219a3..96146dd 100644
--- a/src/libbluray/bdj/bdj_util.h
+++ b/src/libbluray/bdj/native/util.h
@@ -23,7 +23,6 @@
 #include "util/attributes.h"
 
 #include <jni.h>
-#include <stdarg.h>
 
 // makes an object from the specified class name and constructor signature
 BD_PRIVATE jobject bdj_make_object(JNIEnv* env, const char* name, const char* sig, ...);