From ec11ea4ca73646a790f20adf8ded2e48dedd96e5 Mon Sep 17 00:00:00 2001
From: scintilla <scintilla>
Date: Sun, 19 Dec 2004 06:25:27 +0000
Subject: [PATCH] * Convert native jcpuid code from C++ to C. This should
 alleviate build   problems experienced by some users.

---
 core/c/jcpuid/build.sh                            | 4 ++--
 core/c/jcpuid/src/{jcpuid.cpp => jcpuid.c}        | 6 +++---
 history.txt                                       | 6 +++++-
 router/java/src/net/i2p/router/RouterVersion.java | 4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)
 rename core/c/jcpuid/src/{jcpuid.cpp => jcpuid.c} (68%)

diff --git a/core/c/jcpuid/build.sh b/core/c/jcpuid/build.sh
index 2f328c4a6..f5c8ea1e1 100644
--- a/core/c/jcpuid/build.sh
+++ b/core/c/jcpuid/build.sh
@@ -20,7 +20,7 @@ mkdir lib/freenet
 mkdir lib/freenet/support
 mkdir lib/freenet/support/CPUInformation
 
-CPP="g++"
+CC="gcc"
 
 case `uname -sr` in
 MINGW*)
@@ -43,7 +43,7 @@ esac
 
 echo "Compiling C code..."
 rm -f $LIBFILE
-$CPP $LINKFLAGS $INCLUDES src/*.cpp -o $LIBFILE
+$CC $LINKFLAGS $INCLUDES src/*.c -o $LIBFILE
 strip $LIBFILE
 echo Built $LIBFILE
 
diff --git a/core/c/jcpuid/src/jcpuid.cpp b/core/c/jcpuid/src/jcpuid.c
similarity index 68%
rename from core/c/jcpuid/src/jcpuid.cpp
rename to core/c/jcpuid/src/jcpuid.c
index e3ddba9c4..b5ea800ac 100644
--- a/core/c/jcpuid/src/jcpuid.cpp
+++ b/core/c/jcpuid/src/jcpuid.c
@@ -5,8 +5,8 @@ JNIEXPORT jobject JNICALL Java_freenet_support_CPUInformation_CPUID_doCPUID
   (JNIEnv * env, jclass cls, jint iFunction)
 {
 	int a,b,c,d;
-	jclass clsResult = env->FindClass ("freenet/support/CPUInformation/CPUID$CPUIDResult");
-	jmethodID constructor = env->GetMethodID(clsResult,"<init>","(IIII)V" );
+	jclass clsResult = (*env)->FindClass(env, "freenet/support/CPUInformation/CPUID$CPUIDResult");
+	jmethodID constructor = (*env)->GetMethodID(env, clsResult,"<init>","(IIII)V" );
 	#ifdef _MSC_VER
 		//Use MSVC assembler notation
 		_asm 
@@ -30,6 +30,6 @@ JNIEXPORT jobject JNICALL Java_freenet_support_CPUInformation_CPUID_doCPUID
 			:"a"(iFunction)
 		);
 	#endif
-	return env->NewObject(clsResult,constructor,a,b,c,d);
+	return (*env)->NewObject(env, clsResult,constructor,a,b,c,d);
 }
 
diff --git a/history.txt b/history.txt
index 7dccec239..559edd10e 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,8 @@
-$Id: history.txt,v 1.110 2004/12/16 05:21:24 jrandom Exp $
+$Id: history.txt,v 1.111 2004/12/17 23:07:13 jrandom Exp $
+
+2004-12-19  scintilla
+    * Convert native jcpuid code from C++ to C. This should alleviate build
+      problems experienced by some users.
 
 * 2004-12-18  0.4.2.4 released
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 6cc07af47..4ff287151 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.115 $ $Date: 2004/12/16 05:21:23 $";
+    public final static String ID = "$Revision: 1.116 $ $Date: 2004/12/17 23:07:13 $";
     public final static String VERSION = "0.4.2.4";
-    public final static long BUILD = 0;
+    public final static long BUILD = 1;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION);
         System.out.println("Router ID: " + RouterVersion.ID);