diff options
| author | Chris Robinson <[email protected]> | 2010-05-16 06:02:27 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2010-05-16 06:02:27 -0700 |
| commit | 7f533c6a250b8963618e682e9116388338823071 (patch) | |
| tree | 847ad73fef22e33a9f860f4e4e301939de6757c3 | |
| parent | 6dab9d54d1719105e0183f941a2b3dd36e9ba902 (diff) | |
Change inline -> __inline for MSVC
| -rw-r--r-- | Alc/pulseaudio.c | 4 | ||||
| -rw-r--r-- | OpenAL32/Include/alMain.h | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/Alc/pulseaudio.c b/Alc/pulseaudio.c index 45112938..6c611b5a 100644 --- a/Alc/pulseaudio.c +++ b/Alc/pulseaudio.c @@ -29,11 +29,11 @@ #if PA_API_VERSION == 11 #define PA_STREAM_ADJUST_LATENCY 0x2000U -static inline int PA_STREAM_IS_GOOD(pa_stream_state_t x) +static __inline int PA_STREAM_IS_GOOD(pa_stream_state_t x) { return (x == PA_STREAM_CREATING || x == PA_STREAM_READY); } -static inline int PA_CONTEXT_IS_GOOD(pa_context_state_t x) +static __inline int PA_CONTEXT_IS_GOOD(pa_context_state_t x) { return (x == PA_CONTEXT_CONNECTING || x == PA_CONTEXT_AUTHORIZING || x == PA_CONTEXT_SETTING_NAME || x == PA_CONTEXT_READY); diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index c1f06d65..a0251042 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -139,19 +139,19 @@ typedef pthread_key_t tls_type; #define tls_set(x, a) pthread_setspecific((x), (a)) typedef pthread_mutex_t CRITICAL_SECTION; -static inline void EnterCriticalSection(CRITICAL_SECTION *cs) +static __inline void EnterCriticalSection(CRITICAL_SECTION *cs) { int ret; ret = pthread_mutex_lock(cs); assert(ret == 0); } -static inline void LeaveCriticalSection(CRITICAL_SECTION *cs) +static __inline void LeaveCriticalSection(CRITICAL_SECTION *cs) { int ret; ret = pthread_mutex_unlock(cs); assert(ret == 0); } -static inline void InitializeCriticalSection(CRITICAL_SECTION *cs) +static __inline void InitializeCriticalSection(CRITICAL_SECTION *cs) { pthread_mutexattr_t attrib; int ret; @@ -171,7 +171,7 @@ static inline void InitializeCriticalSection(CRITICAL_SECTION *cs) pthread_mutexattr_destroy(&attrib); } -static inline void DeleteCriticalSection(CRITICAL_SECTION *cs) +static __inline void DeleteCriticalSection(CRITICAL_SECTION *cs) { int ret; ret = pthread_mutex_destroy(cs); @@ -182,7 +182,7 @@ static inline void DeleteCriticalSection(CRITICAL_SECTION *cs) * to the expected DWORD. Both are defined as unsigned 32-bit types, however. * Additionally, Win32 is supposed to measure the time since Windows started, * as opposed to the actual time. */ -static inline ALuint timeGetTime(void) +static __inline ALuint timeGetTime(void) { int ret; #if _POSIX_TIMERS > 0 @@ -202,7 +202,7 @@ static inline ALuint timeGetTime(void) #endif } -static inline void Sleep(ALuint t) +static __inline void Sleep(ALuint t) { struct timespec tv, rem; tv.tv_nsec = (t*1000000)%1000000000; @@ -311,7 +311,7 @@ void ResetUIntMap(UIntMap *map); ALenum InsertUIntMapEntry(UIntMap *map, ALuint key, ALvoid *value); void RemoveUIntMapKey(UIntMap *map, ALuint key); -static inline ALvoid *LookupUIntMapKey(UIntMap *map, ALuint key) +static __inline ALvoid *LookupUIntMapKey(UIntMap *map, ALuint key) { if(map->size > 0) { |