From a1a9f5ced24d2ea3e8a11f3d0a6b3b4af39f8cb9 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sun, 13 Feb 2005 13:20:29 +0000 Subject: [PATCH] Made alEnable and alIsExtensionPresent private to AL10.c --- src/native/common/extal.h | 4 ---- src/native/common/org_lwjgl_openal_AL10.c | 7 ++++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/native/common/extal.h b/src/native/common/extal.h index 98c729ff..0a7bad01 100644 --- a/src/native/common/extal.h +++ b/src/native/common/extal.h @@ -96,14 +96,10 @@ extern "C" { void InitializeOpenAL(JNIEnv *env, jobjectArray oalPaths); void DeInitializeOpenAL(); -typedef ALvoid (ALAPIENTRY *alEnablePROC)( ALenum capability ); -typedef ALboolean (ALAPIENTRY *alIsExtensionPresentPROC)( ALubyte* fname ); typedef ALvoid* (ALAPIENTRY *alGetProcAddressPROC)( ALubyte* fname ); typedef ALubyte* (ALAPIENTRY *alGetStringPROC)( ALenum param ); typedef ALenum (ALAPIENTRY *alGetErrorPROC)( ALvoid ); -extern alEnablePROC alEnable; -extern alIsExtensionPresentPROC alIsExtensionPresent; extern alGetProcAddressPROC alGetProcAddress; extern alGetStringPROC alGetString; extern alGetErrorPROC alGetError; diff --git a/src/native/common/org_lwjgl_openal_AL10.c b/src/native/common/org_lwjgl_openal_AL10.c index 1523d7c2..04116256 100644 --- a/src/native/common/org_lwjgl_openal_AL10.c +++ b/src/native/common/org_lwjgl_openal_AL10.c @@ -44,7 +44,8 @@ #include "checkALerror.h" #include "extal.h" -//al +typedef ALboolean (ALAPIENTRY *alIsExtensionPresentPROC)( ALubyte* fname ); +typedef ALvoid (ALAPIENTRY *alEnablePROC)( ALenum capability ); typedef ALvoid (ALAPIENTRY *alDisablePROC)( ALenum capability ); typedef ALboolean (ALAPIENTRY *alIsEnabledPROC)( ALenum capability ); //typedef ALvoid (ALAPIENTRY *alHintPROC)( ALenum target, ALenum mode ); @@ -98,11 +99,11 @@ typedef ALvoid (ALAPIENTRY *alDistanceModelPROC)( ALenum value ); typedef ALvoid (ALAPIENTRY *alDopplerFactorPROC)( ALfloat value ); typedef ALvoid (ALAPIENTRY *alDopplerVelocityPROC)( ALfloat value ); -alIsExtensionPresentPROC alIsExtensionPresent = NULL; alGetStringPROC alGetString = NULL; alGetErrorPROC alGetError = NULL; -alEnablePROC alEnable = NULL; +static alIsExtensionPresentPROC alIsExtensionPresent; +static alEnablePROC alEnable; static alDisablePROC alDisable; static alIsEnabledPROC alIsEnabled; //static alHintPROC alHint;