unix: fix clang -Wlanguage-extension-token warnings

joyent · Aug 31, 2012 · ff0a93a · dvv · Oct 14, 2012 · bnoordhuis
1 parent 5eb1d19
commit ff0a93a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/unix/async.c b/src/unix/async.c
@@ -31,7 +31,7 @@ static void uv__async_io(uv_loop_t* loop, uv__io_t* handle, int events);
 
 
 __attribute__((always_inline))
-inline static int uv__async_make_pending(volatile sig_atomic_t* ptr) {
+static int uv__async_make_pending(volatile sig_atomic_t* ptr) {
   /* Do a cheap read first. */
   if (*ptr)
     return 1;

diff --git a/src/unix/internal.h b/src/unix/internal.h
@@ -31,13 +31,10 @@
 #if defined(__GNUC__)
 # define __read_mostly __attribute__((__section__(".data.read_mostly")))
 #else
+# define __attribute__(v)
 # define __read_mostly
 #endif
 
-#if defined(__STRICT_ANSI__)
-# define inline __inline
-#endif
-
 #undef HAVE_FUTIMES
 #undef HAVE_KQUEUE
 #undef HAVE_PORTS_FS
@@ -108,9 +105,9 @@ enum {
   UV_LOOP_EIO_INITIALIZED = 1
 };
 
-inline static void uv__req_init(uv_loop_t* loop,
-                                uv_req_t* req,
-                                uv_req_type type) {
+__attribute__((unused))
+__attribute__((always_inline))
+static void uv__req_init(uv_loop_t* loop, uv_req_t* req, uv_req_type type) {
   req->type = type;
   uv__req_register(loop, req);
 }