[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2926] trunk/LWJGL/src/native/windows

[<eli...@us...>]

Revision: 2926
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2926&view=rev
Author:   elias_naur
Date:     2007-12-04 02:58:10 -0800 (Tue, 04 Dec 2007)

Log Message:
-----------
Windows: 64bit compilation fixes

Modified Paths:
--------------
    trunk/LWJGL/src/native/windows/Window.h
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c

Modified: trunk/LWJGL/src/native/windows/Window.h
===================================================================
--- trunk/LWJGL/src/native/windows/Window.h	2007-12-04 09:27:54 UTC (rev 2925)
+++ trunk/LWJGL/src/native/windows/Window.h	2007-12-04 10:58:10 UTC (rev 2926)
@@ -42,9 +42,15 @@
 	#define _LWJGL_WINDOW_H_INCLUDED_
 
 	#define WIN32_LEAN_AND_MEAN
-	#define _WIN32_WINDOWS 0x0410
-	#define WINVER 0x0410
-	#define _WIN32_WINNT 0x0400
+	#ifndef _WIN32_WINDOWS
+		#define _WIN32_WINDOWS 0x0410
+	#endif
+	#ifndef WINVER
+		#define WINVER 0x0410
+	#endif
+	#ifndef _WIN32_WINNT
+		#define _WIN32_WINNT 0x0400
+	#endif
 
 	#include <windows.h>
 	#include <jni.h>

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2007-12-04 09:27:54 UTC (rev 2925)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2007-12-04 10:58:10 UTC (rev 2926)
@@ -520,10 +520,10 @@
 	if (handle_buffer != NULL) {
 		cursor_handle = (HCURSOR *)(*env)->GetDirectBufferAddress(env, handle_buffer);
 		cursor = *cursor_handle;
-		SetClassLongPtr(hwnd, GCL_HCURSOR, (LONG_PTR)cursor);
+		SetClassLongPtr(hwnd, GCLP_HCURSOR, (LONG_PTR)cursor);
 		SetCursor(cursor);
 	} else {
-		SetClassLongPtr(hwnd, GCL_HCURSOR, (LONG_PTR)NULL);
+		SetClassLongPtr(hwnd, GCLP_HCURSOR, (LONG_PTR)NULL);
 		SetCursor(LoadCursor(NULL, IDC_ARROW));
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.