~scoopta/WofiJ commit - sourcehut hg

5 files changed, 16 insertions(+), 11 deletions(-)

M wofi_jni/inc/cache_jni.h
M wofi_jni/inc/map_jni.h
M wofi_jni/src/cache_jni.c
M wofi_jni/src/map_jni.c
M wofi_jni/src/wofi_jni.c

M wofi_jni/inc/cache_jni.h +0 -4

@@ 17,13 17,9 @@ 
 
 #ifndef CACHE_JNI_H
 #define CACHE_JNI_H
-#include <string.h>
-#include <stdlib.h>
 
 #include <jni.h>
 
-#include <wofi_api.h>
-
 void cache_jni_init(JNIEnv* env);
 
 #endif

M wofi_jni/inc/map_jni.h +0 -4

@@ 17,13 17,9 @@ 
 
 #ifndef MAP_JNI_H
 #define MAP_JNI_H
-#include <stdlib.h>
-#include <string.h>
 
 #include <jni.h>
 
-#include <map.h>
-
 void map_jni_init(JNIEnv* env);
 
 #endif

M wofi_jni/src/cache_jni.c +5 -0

@@ 17,6 17,11 @@ 
 
 #include <cache_jni.h>
 
+#include <string.h>
+#include <stdlib.h>
+
+#include <wofi_api.h>
+
 static struct wl_list* next(JNIEnv* env, jclass class, struct wl_list* list) {
 	(void) env;
 	(void) class;

M wofi_jni/src/map_jni.c +5 -0

@@ 17,6 17,11 @@ 
 
 #include <map_jni.h>
 
+#include <stdlib.h>
+#include <string.h>
+
+#include <map.h>
+
 static jboolean put(JNIEnv* env, jclass class, struct map* map, jbyteArray jkey, jbyteArray jvalue) {
 	(void) class;
 	char* key = (*env)->GetPrimitiveArrayCritical(env, jkey, NULL);

M wofi_jni/src/wofi_jni.c +6 -3

@@ 15,15 15,18 @@ 
     along with WofiJ.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdlib.h>
+#include <string.h>
 #include <stdbool.h>
 
-#include <jni.h>
+#include <map_jni.h>
+#include <cache_jni.h>
 
+#include <map.h>
 #include <utils.h>
 #include <wofi_api.h>
 
-#include <map_jni.h>
-#include <cache_jni.h>
+#include <jni.h>
 
 static struct mode* mode;
 static JNIEnv* env;