Changeset 880 for trunk/src

Timestamp:

Dec 8, 2003, 6:35:52 AM (22 years ago)

Author:

bird

Message:

Inlined _fmutex_checked_release & _fmutex_checked_request.

Location:

trunk/src/emx

Files:

• include/sys/fmutex.h (modified) (2 diffs, 1 prop)
• src/lib/libc.def (modified) (2 diffs, 1 prop)
• src/lib/process/fmutex2.c (modified) (1 diff, 1 prop)

trunk/src/emx/include/sys/fmutex.h

@@ -7 +7 @@
 #ifndef _SYS_FMUTEX_H
 #define _SYS_FMUTEX_H
+
+#include <stdlib.h> /* need abort */
 
 #if defined (__cplusplus)
@@ -89 +91 @@
 void _fmutex_checked_create (_fmutex *, unsigned);
 void _fmutex_checked_open (_fmutex *);
-void _fmutex_checked_release (_fmutex *);
-void _fmutex_checked_request (_fmutex *, unsigned);
+
+static __inline__ void _fmutex_checked_release (_fmutex * sem)
+{
+  if (_fmutex_release (sem) != 0)
+    abort ();
+}
+
+static __inline__ void _fmutex_checked_request (_fmutex * sem, unsigned flags)
+{
+  if (_fmutex_request (sem, flags) != 0)
+    abort ();
+}
 
 #if defined (__cplusplus)

trunk/src/emx/src/lib/libc.def

@@ -262 +262 @@
     "__fmutex_checked_create" @298
     "__fmutex_checked_open" @299
-    "__fmutex_checked_release" @300
-    "__fmutex_checked_request" @301
+    "___collate_range_cmp" @300
+    "_toupper" @301
     "__fmutex_close" @302
     "__fmutex_create" @303
@@ -824 +824 @@
     "_toascii" @860
     "_tolower" @861
-    "_toupper" @862
-    "___collate_range_cmp" @863

trunk/src/emx/src/lib/process/fmutex2.c

@@ -28 +28 @@
     abort ();
 }
-
-
-void _fmutex_checked_release (_fmutex *sem)
-{
-  if (_fmutex_release (sem) != 0)
-    abort ();
-}
-
-
-void _fmutex_checked_request (_fmutex *sem, unsigned flags)
-{
-  if (_fmutex_request (sem, flags) != 0)
-    abort ();
-}