uv-common.h in uvrb-0.2.0

- old
+ new

@@ -29,33 +29,24 @@
 
 #include <assert.h>
 #include <stddef.h>
 
 #if defined(_MSC_VER) && _MSC_VER < 1600
-# include "uv-private/stdint-msvc2008.h"
+# include "stdint-msvc2008.h"
 #else
 # include <stdint.h>
 #endif
 
 #include "uv.h"
 #include "tree.h"
+#include "queue.h"
 
-
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
 #define container_of(ptr, type, member) \
   ((type *) ((char *) (ptr) - offsetof(type, member)))
 
-#ifdef _MSC_VER
-# define UNUSED /* empty */
-# define INLINE __inline
-#else
-# define UNUSED __attribute__((unused))
-# define INLINE inline
-#endif
-
-
 #ifndef _WIN32
 enum {
   UV__HANDLE_INTERNAL = 0x8000,
   UV__HANDLE_ACTIVE   = 0x4000,
   UV__HANDLE_REF      = 0x2000,
@@ -66,19 +57,10 @@
 # define UV__HANDLE_ACTIVE    0x40
 # define UV__HANDLE_REF       0x20
 # define UV__HANDLE_CLOSING   0x01
 #endif
 
-extern const uv_err_t uv_ok_;
-
-uv_err_code uv_translate_sys_error(int sys_errno);
-int uv__set_error(uv_loop_t* loop, uv_err_code code, int sys_error);
-int uv__set_sys_error(uv_loop_t* loop, int sys_error);
-int uv__set_artificial_error(uv_loop_t* loop, uv_err_code code);
-uv_err_t uv__new_sys_error(int sys_error);
-uv_err_t uv__new_artificial_error(uv_err_code code);
-
 int uv__tcp_bind(uv_tcp_t* handle, struct sockaddr_in addr);
 int uv__tcp_bind6(uv_tcp_t* handle, struct sockaddr_in6 addr);
 
 int uv__udp_bind(uv_udp_t* handle, struct sockaddr_in addr, unsigned flags);
 int uv__udp_bind6(uv_udp_t* handle, struct sockaddr_in6 addr, unsigned flags);
@@ -112,24 +94,25 @@
 
 int uv__udp_recv_stop(uv_udp_t* handle);
 
 void uv__fs_poll_close(uv_fs_poll_t* handle);
 
+int uv__getaddrinfo_translate_error(int sys_err);    /* EAI_* error. */
 
 #define uv__has_active_reqs(loop)                                             \
-  (ngx_queue_empty(&(loop)->active_reqs) == 0)
+  (QUEUE_EMPTY(&(loop)->active_reqs) == 0)
 
 #define uv__req_register(loop, req)                                           \
   do {                                                                        \
-    ngx_queue_insert_tail(&(loop)->active_reqs, &(req)->active_queue);        \
+    QUEUE_INSERT_TAIL(&(loop)->active_reqs, &(req)->active_queue);            \
   }                                                                           \
   while (0)
 
 #define uv__req_unregister(loop, req)                                         \
   do {                                                                        \
     assert(uv__has_active_reqs(loop));                                        \
-    ngx_queue_remove(&(req)->active_queue);                                   \
+    QUEUE_REMOVE(&(req)->active_queue);                                       \
   }                                                                           \
   while (0)
 
 #define uv__has_active_handles(loop)                                          \
   ((loop)->active_handles > 0)
@@ -186,10 +169,13 @@
     if (((h)->flags & UV__HANDLE_CLOSING) != 0) break;                        \
     if (((h)->flags & UV__HANDLE_ACTIVE) != 0) uv__active_handle_rm(h);       \
   }                                                                           \
   while (0)
 
+#define uv__has_ref(h)                                                        \
+  (((h)->flags & UV__HANDLE_REF) != 0)
+
 #if defined(_WIN32)
 # define uv__handle_platform_init(h)
 #else
 # define uv__handle_platform_init(h) ((h)->next_closing = NULL)
 #endif
@@ -197,10 +183,10 @@
 #define uv__handle_init(loop_, h, type_)                                      \
   do {                                                                        \
     (h)->loop = (loop_);                                                      \
     (h)->type = (type_);                                                      \
     (h)->flags = UV__HANDLE_REF;  /* Ref the loop when active. */             \
-    ngx_queue_insert_tail(&(loop_)->handle_queue, &(h)->handle_queue);        \
+    QUEUE_INSERT_TAIL(&(loop_)->handle_queue, &(h)->handle_queue);            \
     uv__handle_platform_init(h);                                              \
   }                                                                           \
   while (0)
 
 #endif /* UV_COMMON_H_ */