4 files changed, 31 insertions, 89 deletions
diff --git a/make/stub_includes/openal/al-types.h b/make/stub_includes/openal/al-types.h
index 373e125..86c952d 100644
--- a/make/stub_includes/openal/al-types.h
+++ b/make/stub_includes/openal/al-types.h
@@ -90,16 +90,8 @@ typedef double ALdouble;
 /** void type (for opaque pointers only) */
 typedef void ALvoid;
 
-/* Enumerant values begin at column 50. No tabs. */
-
-/** "no distance model" or "no buffer" */
-#define AL_NONE                                  0
-
-/** Boolean False. */
-#define AL_FALSE                                 0
-
-/** Boolean True. */
-#define AL_TRUE                                  1
+/** void* function pointer type for all al*GetProcAddress (By JOAL/GlueGen) */
+typedef void* ALproc;
 
 #if defined(__cplusplus)
 }  /* extern "C" */
diff --git a/make/stub_includes/openal/al.h b/make/stub_includes/openal/al.h
index 49a4119..49ed277 100644
--- a/make/stub_includes/openal/al.h
+++ b/make/stub_includes/openal/al.h
@@ -5,7 +5,21 @@
 #define AL_ALEXT_PROTOTYPES
 #define AL_EXT_FOLDBACK
 #include "al-types.h"
-#include "alc-types.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/* Enumerant values begin at column 50. No tabs. */
+
+/** "no distance model" or "no buffer" */
+#define AL_NONE                                  0
+
+/** Boolean False. */
+#define AL_FALSE                                 0
+
+/** Boolean True. */
+#define AL_TRUE                                  1
 
 /**
  * Relative source.
@@ -400,7 +414,7 @@ AL_API ALenum AL_APIENTRY alGetError(void);
  * pointers and enum values.
  */
 AL_API ALboolean AL_APIENTRY alIsExtensionPresent(const ALchar *extname);
-AL_API void* AL_APIENTRY alGetProcAddress(const ALchar *fname);
+AL_API ALproc AL_APIENTRY alGetProcAddress(const ALchar *fname);
 AL_API ALenum AL_APIENTRY alGetEnumValue(const ALchar *ename);
 
 
diff --git a/make/stub_includes/openal/alc-types.h b/make/stub_includes/openal/alc-types.h
index b84fe7b..2616af8 100644
--- a/make/stub_includes/openal/alc-types.h
+++ b/make/stub_includes/openal/alc-types.h
@@ -29,17 +29,18 @@ extern "C" {
  * The ALCAPI, ALCAPIENTRY, and ALC_INVALID macros are deprecated, but are
  * included for applications porting code from AL 1.0
  */
-#define ALCAPI ALC_API
-#define ALCAPIENTRY ALC_APIENTRY
-#define ALC_INVALID 0
+#define ALCAPI                                   ALC_API
+#define ALCAPIENTRY                              ALC_APIENTRY
+#define ALC_INVALID                              0
 
+/** ALC Version */
+#define ALC_VERSION_0_1                          1
 
-#define ALC_VERSION_0_1         1
-
+/** Opaque device handle */
 typedef struct ALCdevice_struct ALCdevice;
+/** Opaque context handle */
 typedef struct ALCcontext_struct ALCcontext;
 
-
 /** 8-bit boolean */
 typedef char ALCboolean;
 
@@ -79,6 +80,9 @@ typedef double ALCdouble;
 /** void type (for opaque pointers only) */
 typedef void ALCvoid;
 
+/** void* function pointer type for all al*GetProcAddress (By JOAL/GlueGen) */
+typedef void* ALCproc;
+
 /**
  * intptr_t:
  *   Using <gluegen_stddef.h>
diff --git a/make/stub_includes/openal/alc.h b/make/stub_includes/openal/alc.h
index 294e8b3..4170b62 100644
--- a/make/stub_includes/openal/alc.h
+++ b/make/stub_includes/openal/alc.h
@@ -1,80 +1,12 @@
 #ifndef AL_ALC_H
 #define AL_ALC_H
 
+#include "alc-types.h"
+
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
-#ifndef ALC_API
- #if defined(AL_LIBTYPE_STATIC)
-  #define ALC_API
- #elif defined(_WIN32)
-  #define ALC_API __declspec(dllimport)
- #else
-  #define ALC_API extern
- #endif
-#endif
-
-#if defined(_WIN32)
- #define ALC_APIENTRY __cdecl
-#else
- #define ALC_APIENTRY
-#endif
-
-
-/** Deprecated macro. */
-#define ALCAPI                                   ALC_API
-#define ALCAPIENTRY                              ALC_APIENTRY
-#define ALC_INVALID                              0
-
-/** Supported ALC version? */
-#define ALC_VERSION_0_1                          1
-
-/** Opaque device handle */
-typedef struct ALCdevice_struct ALCdevice;
-/** Opaque context handle */
-typedef struct ALCcontext_struct ALCcontext;
-
-/** 8-bit boolean */
-typedef char ALCboolean;
-
-/** character */
-typedef char ALCchar;
-
-/** signed 8-bit 2's complement integer */
-typedef signed char ALCbyte;
-
-/** unsigned 8-bit integer */
-typedef unsigned char ALCubyte;
-
-/** signed 16-bit 2's complement integer */
-typedef short ALCshort;
-
-/** unsigned 16-bit integer */
-typedef unsigned short ALCushort;
-
-/** signed 32-bit 2's complement integer */
-typedef int ALCint;
-
-/** unsigned 32-bit integer */
-typedef unsigned int ALCuint;
-
-/** non-negative 32-bit binary integer size */
-typedef int ALCsizei;
-
-/** enumerated 32-bit value */
-typedef int ALCenum;
-
-/** 32-bit IEEE754 floating-point */
-typedef float ALCfloat;
-
-/** 64-bit IEEE754 floating-point */
-typedef double ALCdouble;
-
-/** void type (for opaque pointers only) */
-typedef void ALCvoid;
-
-
 /* Enumerant values begin at column 50. No tabs. */
 
 /** Boolean False. */
@@ -194,7 +126,7 @@ ALC_API ALCenum ALC_APIENTRY alcGetError(ALCdevice *device);
  * function pointers and enum values.
  */
 ALC_API ALCboolean ALC_APIENTRY alcIsExtensionPresent(ALCdevice *device, const ALCchar *extname);
-ALC_API void*      ALC_APIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar *funcname);
+ALC_API ALCproc ALC_APIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar *funcname);
 ALC_API ALCenum    ALC_APIENTRY alcGetEnumValue(ALCdevice *device, const ALCchar *enumname);
 
 /** Query function. */