Thread: [Java-game-lib-cvs] LWJGL/src/native/linux org_lwjgl_opengl_Display.c,1.31,1.32

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1927/src/native/linux

Modified Files:
	org_lwjgl_opengl_Display.c 
Log Message:
Linux: Don't assume JAWT Lock()/Unlock() are re-entrant, fixing a hang with GCJ 4

Index: org_lwjgl_opengl_Display.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- org_lwjgl_opengl_Display.c	6 Jul 2005 19:46:35 -0000	1.31
+++ org_lwjgl_opengl_Display.c	23 Oct 2005 19:41:09 -0000	1.32
@@ -124,7 +124,6 @@
 	return 0;
 }
 
-
 Display *getDisplay(void) {
 	return display_connection;
 }
@@ -556,21 +555,21 @@
 	return focused || isLegacyFullscreen() ? JNI_TRUE : JNI_FALSE;
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_lockAWT(JNIEnv *env, jclass clazz) {
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nLockAWT(JNIEnv *env, jclass clazz) {
 	JAWT jawt;
 	jawt.version = JAWT_VERSION_1_4;
 	if (JAWT_GetAWT(env, &jawt) != JNI_TRUE) {
-		throwGeneralException(env, "java/lang/RuntimeException", "GetAWT failed");
+		throwException(env, "GetAWT failed");
 		return;
 	}
 	jawt.Lock(env);
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_unlockAWT(JNIEnv *env, jclass clazz) {
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nUnlockAWT(JNIEnv *env, jclass clazz) {
 	JAWT jawt;
 	jawt.version = JAWT_VERSION_1_4;
 	if (JAWT_GetAWT(env, &jawt) != JNI_TRUE) {
-		throwGeneralException(env, "java/lang/RuntimeException", "GetAWT failed");
+		throwException(env, "GetAWT failed");
 		return;
 	}
 	jawt.Unlock(env);