From 8db05b8c17cd0ae72d87a475bdda506ec606bff6 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sun, 12 Jun 2011 04:45:03 -0700 Subject: Avoid defining a macro twice --- OpenAL32/Include/alMain.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 618f5d3f..90095d72 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -193,6 +193,9 @@ typedef DWORD tls_type; #define tls_set(x, a) TlsSetValue((x), (a)) #define HAVE_DYNLOAD 1 +void *LoadLib(const char *name); +void CloseLib(void *handle); +void *GetSymbol(void *handle, const char *name); #else @@ -269,6 +272,9 @@ static __inline void Sleep(ALuint t) #if defined(HAVE_DLFCN_H) #define HAVE_DYNLOAD 1 +void *LoadLib(const char *name); +void CloseLib(void *handle); +void *GetSymbol(void *handle, const char *name); #endif #endif @@ -588,14 +594,6 @@ void al_print(const char *fname, unsigned int line, const char *fmt, ...) PRINTF_STYLE(3,4); #define AL_PRINT(...) al_print(__FILE__, __LINE__, __VA_ARGS__) - -#if defined(_WIN32) || defined(HAVE_DLFCN_H) -#define HAVE_DYNLOAD 1 -void *LoadLib(const char *name); -void CloseLib(void *handle); -void *GetSymbol(void *handle, const char *name); -#endif - extern ALdouble ConeScale; extern ALdouble ZScale; -- cgit v1.2.3