diff options
| author | Kenneth Russel <[email protected]> | 2009-06-16 20:49:10 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2009-06-16 20:49:10 +0000 |
| commit | bcfd26355acdf2b9200157e7d171c3ac1324865b (patch) | |
| tree | 734b0d006bb937a698eddf5fff42037b078b9048 /src | |
| parent | 5ca942d926199a4c6a453a8513154e107e15d7c7 (diff) | |
Attempt to fix compilation under MSVC 6
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1965 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src')
| -rwxr-xr-x | src/newt/native/WindowsWindow.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/newt/native/WindowsWindow.c b/src/newt/native/WindowsWindow.c index f609de08d..52bc03018 100755 --- a/src/newt/native/WindowsWindow.c +++ b/src/newt/native/WindowsWindow.c @@ -626,9 +626,9 @@ static LRESULT CALLBACK wndProc(HWND wnd, UINT message, case WM_DESTROY: { #if defined(UNDER_CE) || _MSC_VER <= 1200 - SetWindowLong(wnd, GWL_USERDATA, NULL); + SetWindowLong(wnd, GWL_USERDATA, (intptr_t) NULL); #else - SetWindowLongPtr(wnd, GWLP_USERDATA, NULL); + SetWindowLongPtr(wnd, GWLP_USERDATA, (intptr_t) NULL); #endif free(wud); wud=NULL; (*env)->CallVoidMethod(env, window, windowDestroyedID); @@ -993,7 +993,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_MonitorFr #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410 || WINVER >= 0x0500) && !defined(_WIN32_WCE) return (jlong)MonitorFromWindow((HWND)window, MONITOR_DEFAULTTOPRIMARY); #else - #warning NO MULTI MONITOR SUPPORT + #warn NO MULTI MONITOR SUPPORT return 0; #endif } |