diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2009-03-31 10:44:53 +0200 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2009-03-31 10:44:53 +0200 |
| commit | adb36b9285ca8cf0e3d3a690f6682c20187379a1 (patch) | |
| tree | c129d9ab409b7dc1301a27f1b5f4784a8d68dade /include | |
| parent | ab86dda9cc66a946d257ecb96cbf8a17662af045 (diff) | |
| download | wolfbones-adb36b9285ca8cf0e3d3a690f6682c20187379a1.tar.gz wolfbones-adb36b9285ca8cf0e3d3a690f6682c20187379a1.tar.bz2 | |
fixed inlining with microsoft compiler, introduced a INLINE macro
Diffstat (limited to 'include')
| -rw-r--r-- | include/wolf/mutex.h | 8 | ||||
| -rw-r--r-- | include/wolf/port/sys.h | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/include/wolf/mutex.h b/include/wolf/mutex.h index 33c3ee9..fd01b36 100644 --- a/include/wolf/mutex.h +++ b/include/wolf/mutex.h @@ -49,13 +49,13 @@ typedef pthread_mutex_t wolf_mutex_t; wolf_error_t wolf_mutex_init( wolf_mutex_t *mutex ); wolf_error_t wolf_mutex_destroy( wolf_mutex_t *mutex ); -static inline void wolf_mutex_lock( wolf_mutex_t *mutex ) { +static INLINE void wolf_mutex_lock( wolf_mutex_t *mutex ) { int res; res = pthread_mutex_lock( mutex ); assert( res == 0 ); } -static inline void wolf_mutex_unlock( wolf_mutex_t *mutex ) { +static INLINE void wolf_mutex_unlock( wolf_mutex_t *mutex ) { int res; res = pthread_mutex_unlock( mutex ); assert( res == 0 ); @@ -74,11 +74,11 @@ typedef CRITICAL_SECTION wolf_mutex_t; wolf_error_t wolf_mutex_init( wolf_mutex_t *mutex ); wolf_error_t wolf_mutex_destroy( wolf_mutex_t *mutex ); -static void wolf_mutex_lock( wolf_mutex_t *mutex ) { +static INLINE void wolf_mutex_lock( wolf_mutex_t *mutex ) { EnterCriticalSection( mutex ); } -static void wolf_mutex_unlock( wolf_mutex_t *mutex ) { +static INLINE void wolf_mutex_unlock( wolf_mutex_t *mutex ) { LeaveCriticalSection( mutex ); } diff --git a/include/wolf/port/sys.h b/include/wolf/port/sys.h index 801fc61..de80f56 100644 --- a/include/wolf/port/sys.h +++ b/include/wolf/port/sys.h @@ -245,6 +245,13 @@ #if defined _MSC_VER #endif /* defined _MSC_VER */ +/* define INLINE (C99 inlining attribute is not yet known by all compilers */ +#if defined _MSC_VER +#define INLINE __inline +#else +#define INLINE inline +#endif + /* define one version string for comparing GNU c versions */ #if defined __GNUC__ #if defined __GNUC_PATCHLEVEL__ |