From 55a889d05307c8af7e7f7587d42ec6edf083566a Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Tue, 13 Mar 2007 08:18:00 +0000 Subject: [PATCH] Use jawt_md.h instead of jawt.h since that is apparently the official way of using JAWT (from the example in jawt.h) and is required for lwjgl to compile with the ibm 1.5 jdk --- src/native/common/awt_tools.h | 2 +- src/native/common/org_lwjgl_opengl_AWTSurfaceLock.c | 2 +- src/native/linux/org_lwjgl_opengl_Display.c | 2 +- src/native/linux/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c | 1 - src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m | 1 - .../windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c | 1 - 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/native/common/awt_tools.h b/src/native/common/awt_tools.h index 956155bf..b5951ed6 100644 --- a/src/native/common/awt_tools.h +++ b/src/native/common/awt_tools.h @@ -41,7 +41,7 @@ #define __LWJGL_AWT_TOOLS_H #include -#include +#include typedef struct { JAWT awt; diff --git a/src/native/common/org_lwjgl_opengl_AWTSurfaceLock.c b/src/native/common/org_lwjgl_opengl_AWTSurfaceLock.c index 70e7628c..9209ba8f 100644 --- a/src/native/common/org_lwjgl_opengl_AWTSurfaceLock.c +++ b/src/native/common/org_lwjgl_opengl_AWTSurfaceLock.c @@ -38,7 +38,7 @@ */ #include -#include +#include #include "org_lwjgl_opengl_AWTSurfaceLock.h" #include "awt_tools.h" #include "common_tools.h" diff --git a/src/native/linux/org_lwjgl_opengl_Display.c b/src/native/linux/org_lwjgl_opengl_Display.c index af8c4115..c381c790 100644 --- a/src/native/linux/org_lwjgl_opengl_Display.c +++ b/src/native/linux/org_lwjgl_opengl_Display.c @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include "common_tools.h" #include "extgl.h" #include "extgl_glx.h" diff --git a/src/native/linux/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c b/src/native/linux/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c index 731c41ac..3745fac8 100644 --- a/src/native/linux/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c +++ b/src/native/linux/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c @@ -38,7 +38,6 @@ */ #include -#include #include #include #include diff --git a/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m b/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m index 45165947..c1d7b2b4 100644 --- a/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m +++ b/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m @@ -38,7 +38,6 @@ */ #include -#include #include #include "awt_tools.h" #include "org_lwjgl_opengl_MacOSXCanvasPeerInfo.h" diff --git a/src/native/windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c b/src/native/windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c index 995c8ed9..b2baea46 100644 --- a/src/native/windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c +++ b/src/native/windows/org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.c @@ -38,7 +38,6 @@ */ #include -#include #include #include "awt_tools.h" #include "org_lwjgl_opengl_WindowsAWTGLCanvasPeerInfo.h"