diff options
| author | Kenneth Russel <[email protected]> | 2005-02-26 01:41:28 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2005-02-26 01:41:28 +0000 |
| commit | b41b720c4366d4e2cdc1ba146123b87da966d724 (patch) | |
| tree | 6c6c8196e9ac0ef57f068f394c1720ec034639c2 /src/native | |
| parent | 2bb02ad536c5404f008ff71c6d4ca013abaff683 (diff) | |
Merged with current JOGL trunk (tag JOGL_1_1_PRE_B10)
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@245 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src/native')
| -rw-r--r-- | src/native/jogl/BufferUtils.c | 4 | ||||
| -rw-r--r-- | src/native/jogl/InternalBufferUtils.c | 4 | ||||
| -rw-r--r-- | src/native/jogl/JAWT_DrawingSurfaceInfo.c | 2 | ||||
| -rw-r--r-- | src/native/jogl/MacOSXWindowSystemInterface.m | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/native/jogl/BufferUtils.c b/src/native/jogl/BufferUtils.c index d5ea5b36e..7698b00ba 100644 --- a/src/native/jogl/BufferUtils.c +++ b/src/native/jogl/BufferUtils.c @@ -40,8 +40,8 @@ #include <jni.h> #ifdef _MSC_VER - /* This typedef is only needed for VC6 */ - #if _MSC_VER <= 1200 + /* This typedef seems to be needed at least for VC6 and Visual Studio 2003 */ + #if _MSC_VER <= 1400 typedef int intptr_t; #endif #else diff --git a/src/native/jogl/InternalBufferUtils.c b/src/native/jogl/InternalBufferUtils.c index 395396ac8..73c52011f 100644 --- a/src/native/jogl/InternalBufferUtils.c +++ b/src/native/jogl/InternalBufferUtils.c @@ -40,8 +40,8 @@ #include <jni.h> #ifdef _MSC_VER - /* This typedef is only needed for VC6 */ - #if _MSC_VER <= 1200 + /* This typedef seems to be needed at least for VC6 and Visual Studio 2003 */ + #if _MSC_VER <= 1400 typedef int intptr_t; #endif #else diff --git a/src/native/jogl/JAWT_DrawingSurfaceInfo.c b/src/native/jogl/JAWT_DrawingSurfaceInfo.c index 523bfba3e..59c575f0c 100644 --- a/src/native/jogl/JAWT_DrawingSurfaceInfo.c +++ b/src/native/jogl/JAWT_DrawingSurfaceInfo.c @@ -42,7 +42,7 @@ #ifdef WIN32 #define PLATFORM_DSI_SIZE sizeof(JAWT_Win32DrawingSurfaceInfo) static const char* platformDSIClassName = "net/java/games/jogl/impl/windows/JAWT_Win32DrawingSurfaceInfo"; -#elif defined(linux) || defined(__sun) +#elif defined(linux) || defined(__sun) || defined(__FreeBSD__) #define PLATFORM_DSI_SIZE sizeof(JAWT_X11DrawingSurfaceInfo) static const char* platformDSIClassName = "net/java/games/jogl/impl/x11/JAWT_X11DrawingSurfaceInfo"; #elif defined(macosx) diff --git a/src/native/jogl/MacOSXWindowSystemInterface.m b/src/native/jogl/MacOSXWindowSystemInterface.m index c56f6e5bb..afa0fea69 100644 --- a/src/native/jogl/MacOSXWindowSystemInterface.m +++ b/src/native/jogl/MacOSXWindowSystemInterface.m @@ -17,6 +17,7 @@ typedef int Bool; NSAutoreleasePool* gAutoreleasePool = NULL; void* createContext(void* shareContext, void* view, + int doubleBuffer, int redBits, int greenBits, int blueBits, |