I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* Convert native jcpuid code from C++ to C. This should alleviate build

Browse Source 
problems experienced by some users.
This commit is contained in:
scintilla
2004-12-19 06:25:27 +00:00
committed by zzz
parent a1ebf85e1b
commit ec11ea4ca7
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/c/jcpuid/build.sh
View File

@ -20,7 +20,7 @@ mkdir lib/freenet
mkdir lib/freenet/support mkdir lib/freenet/support
mkdir lib/freenet/support/CPUInformation mkdir lib/freenet/support/CPUInformation
CPP="g++" CC="gcc"
case `uname -sr` in case `uname -sr` in
MINGW*) MINGW*)
@ -43,7 +43,7 @@ esac
echo "Compiling C code..." echo "Compiling C code..."
rm -f $LIBFILE rm -f $LIBFILE
$CPP $LINKFLAGS $INCLUDES src/*.cpp -o $LIBFILE $CC $LINKFLAGS $INCLUDES src/*.c -o $LIBFILE
strip $LIBFILE strip $LIBFILE
echo Built $LIBFILE echo Built $LIBFILE

6
core/c/jcpuid/src/jcpuid.cpp → core/c/jcpuid/src/jcpuid.c
View File

@ -5,8 +5,8 @@ JNIEXPORT jobject JNICALL Java_freenet_support_CPUInformation_CPUID_doCPUID
(JNIEnv * env, jclass cls, jint iFunction) (JNIEnv * env, jclass cls, jint iFunction)
{ {
int a,b,c,d; int a,b,c,d;
jclass clsResult = env->FindClass ("freenet/support/CPUInformation/CPUID$CPUIDResult"); jclass clsResult = (*env)->FindClass(env, "freenet/support/CPUInformation/CPUID$CPUIDResult");
jmethodID constructor = env->GetMethodID(clsResult,"<init>","(IIII)V" ); jmethodID constructor = (*env)->GetMethodID(env, clsResult,"<init>","(IIII)V" );
#ifdef _MSC_VER #ifdef _MSC_VER
//Use MSVC assembler notation //Use MSVC assembler notation
_asm _asm
@ -30,6 +30,6 @@ JNIEXPORT jobject JNICALL Java_freenet_support_CPUInformation_CPUID_doCPUID
:"a"(iFunction) :"a"(iFunction)
); );
#endif #endif
return env->NewObject(clsResult,constructor,a,b,c,d); return (*env)->NewObject(env, clsResult,constructor,a,b,c,d);
} }

6
history.txt
View File

@ -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 * 2004-12-18 0.4.2.4 released

4
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
* *
*/ */
public class RouterVersion { 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 String VERSION = "0.4.2.4";
public final static long BUILD = 0; public final static long BUILD = 1;
public static void main(String args[]) { public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION); System.out.println("I2P Router version: " + VERSION);
System.out.println("Router ID: " + RouterVersion.ID); System.out.println("Router ID: " + RouterVersion.ID);