From af4368f42738993a4f1272c17e12c3155f6d99ba Mon Sep 17 00:00:00 2001
From: Brian Matzon <brian@matzon.dk>
Date: Thu, 28 Nov 2002 20:25:10 +0000
Subject: [PATCH] fix: make OpenAL compile, by not including extal.h in files,
 but CoreEAX - somekind of circular dependency ?

---
 src/native/common/org_lwjgl_openal_ALC.cpp         | 4 +++-
 src/native/common/org_lwjgl_openal_ALUT.cpp        | 9 ++++-----
 src/native/common/org_lwjgl_openal_CoreAL.cpp      | 6 +++---
 src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp | 3 +++
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/native/common/org_lwjgl_openal_ALC.cpp b/src/native/common/org_lwjgl_openal_ALC.cpp
index 30297939..27e7534a 100644
--- a/src/native/common/org_lwjgl_openal_ALC.cpp
+++ b/src/native/common/org_lwjgl_openal_ALC.cpp
@@ -39,8 +39,10 @@
  * @version $Revision$
  */
 #include "org_lwjgl_openal_ALC.h"
-#include "extal.h"
+
+/* OpenAL includes */
 #include "checkALerror.h"
+#include <AL/alc.h>
 
 /*
  * Class:     org_lwjgl_openal_ALC
diff --git a/src/native/common/org_lwjgl_openal_ALUT.cpp b/src/native/common/org_lwjgl_openal_ALUT.cpp
index dcdaa9d6..b9849dde 100644
--- a/src/native/common/org_lwjgl_openal_ALUT.cpp
+++ b/src/native/common/org_lwjgl_openal_ALUT.cpp
@@ -40,14 +40,13 @@
  * @version $Revision$
  */
 #include "org_lwjgl_openal_ALUT.h"
-/* OpenAL includes */
-#include "extal.h"
-
-#include "checkALerror.h"
-
 
 #include <stdlib.h>
 
+/* OpenAL includes */
+#include "checkALerror.h"
+#include <AL/alut.h>
+
 /*
  * Class:     org_lwjgl_openal_ALUT
  * Method:    nCreate
diff --git a/src/native/common/org_lwjgl_openal_CoreAL.cpp b/src/native/common/org_lwjgl_openal_CoreAL.cpp
index 1185bb91..58e65d44 100644
--- a/src/native/common/org_lwjgl_openal_CoreAL.cpp
+++ b/src/native/common/org_lwjgl_openal_CoreAL.cpp
@@ -40,10 +40,10 @@
  * @version $Revision$
  */
 #include "org_lwjgl_openal_CoreAL.h"
-/* OpenAL includes */
-#include "extal.h"
-#include "checkALerror.h"
 
+/* OpenAL includes */
+#include "checkALerror.h"
+#include <AL/al.h>
 
 /**
  * This function enables a feature of the OpenAL driver.
diff --git a/src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp b/src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp
index 6bc22cf8..24fdb2d6 100644
--- a/src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp
+++ b/src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp
@@ -39,8 +39,11 @@
  * @version $Revision$
  */
 #include "org_lwjgl_openal_eax_CoreEAX.h"
+
+/* OpenAL includes */
 #include "extal.h"
 #include "checkALerror.h"
+#include <AL/alc.h>
 
 /**
  * Throws an OAL exception with the specified message