Index: ../trunk-jpl/src/android/ISSM/jni/com_example_issm_IssmJni.h
===================================================================
--- ../trunk-jpl/src/android/ISSM/jni/com_example_issm_IssmJni.h	(revision 13958)
+++ ../trunk-jpl/src/android/ISSM/jni/com_example_issm_IssmJni.h	(revision 13959)
@@ -1,21 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_example_issm_IssmJni */
-
-#ifndef _Included_com_example_issm_IssmJni
-#define _Included_com_example_issm_IssmJni
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     com_example_issm_IssmJni
- * Method:    fac
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_com_example_issm_IssmJni_fac
-  (JNIEnv *, jclass, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
Index: ../trunk-jpl/src/android/ISSM/jni/Main_nojavah.cpp
===================================================================
--- ../trunk-jpl/src/android/ISSM/jni/Main_nojavah.cpp	(revision 13958)
+++ ../trunk-jpl/src/android/ISSM/jni/Main_nojavah.cpp	(revision 13959)
@@ -1,40 +0,0 @@
-#include <jni.h>
-#include "../../../c/android/fac.h"
-namespace com_example_issm
-{
-	static jlong factorial(JNIEnv *env, jclass clazz, jlong n)
-	{
-		fac *f = new fac();
-		jlong result = (jlong) (f->factorial(n));
-		delete(f);
-		return (jlong) result;
-	}
-//------------------------------------------------------------------------------------
-	static JNINativeMethod method_table[] = {
-			{"fac" ,"(J)J" , (void *) factorial},
-	};
-}
-
-using namespace com_example_issm;
-
-extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved)
-{
-    JNIEnv* env;
-    if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
-        return -1;
-    }
-    else
-    {
-    	jclass clazz = env->FindClass("com/example/issm/IssmJni");
-    	if(clazz)
-    	{
-    		env->RegisterNatives(clazz, method_table, 1);
-    		env->DeleteLocalRef(clazz);
-    		return JNI_VERSION_1_6;
-    	}
-    	else return -1;
-    }
-
-    // Get jclass with env->FindClass.
-    // Register methods with env->RegisterNatives.
-}
\ No newline at end of file
Index: ../trunk-jpl/src/android/ISSM/jni/Main.cpp
===================================================================
--- ../trunk-jpl/src/android/ISSM/jni/Main.cpp	(revision 13958)
+++ ../trunk-jpl/src/android/ISSM/jni/Main.cpp	(revision 13959)
@@ -1,11 +1,40 @@
+#include <jni.h>
 #include "../../../c/android/fac.h"
-#include "com_example_issm_IssmJni.h"
-#include <cstddef>
+namespace com_example_issm
+{
+	static jlong factorial(JNIEnv *env, jclass clazz, jlong n)
+	{
+		fac *f = new fac();
+		jlong result = (jlong) (f->factorial(n));
+		delete(f);
+		return (jlong) result;
+	}
+//------------------------------------------------------------------------------------
+	static JNINativeMethod method_table[] = {
+			{"fac" ,"(J)J" , (void *) factorial},
+	};
+}
 
-JNIEXPORT jlong JNICALL Java_com_example_issm_IssmJni_fac(JNIEnv *env, jclass clazz, jlong n)
+using namespace com_example_issm;
+
+extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved)
 {
-	fac *f = new fac();
-	jlong result = (jlong) (f->factorial(n));
-	delete(f);
-	return (jlong) result;
-}
+    JNIEnv* env;
+    if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
+        return -1;
+    }
+    else
+    {
+    	jclass clazz = env->FindClass("com/example/issm/IssmJni");
+    	if(clazz)
+    	{
+    		env->RegisterNatives(clazz, method_table, 1);
+    		env->DeleteLocalRef(clazz);
+    		return JNI_VERSION_1_6;
+    	}
+    	else return -1;
+    }
+
+    // Get jclass with env->FindClass.
+    // Register methods with env->RegisterNatives.
+}
\ No newline at end of file