I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues 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/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

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)
{
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);
}