Removing njs_stub.h.

diff --git a/src/njs.h b/src/njs.h
index deb06f7d5a4eb4c4afbe8fdce48eaac9cb5773bc..c72a996977a03807fd8e5aec4ac16a243f18f3bc 100644 (file)
--- a/src/njs.h
+++ b/src/njs.h
@@ -17,7 +17,6 @@
 #include <njs_types.h>
 #include <njs_clang.h>
 #include <njs_str.h>
-#include <njs_stub.h>
 #include <njs_lvlhsh.h>
 
 

diff --git a/src/njs_clang.h b/src/njs_clang.h
index 3356ec19f0df37a15ee725e64a6e6b3f95ab5ebb..04b07ff5ae03f58f936aeecca83daa173b260985 100644 (file)
--- a/src/njs_clang.h
+++ b/src/njs_clang.h
@@ -24,6 +24,12 @@
 #define njs_nitems(x)                                                         \
     (sizeof(x) / sizeof((x)[0]))
 
+#define njs_max(val1, val2)                                                   \
+    ((val1 < val2) ? (val2) : (val1))
+
+#define njs_min(val1, val2)                                                   \
+    ((val1 < val2) ? (val1) : (val2))
+
 
 #if (NJS_HAVE_BUILTIN_EXPECT)
 #define njs_expect(c, x)   __builtin_expect((long) (x), (c))

diff --git a/src/njs_djb_hash.c b/src/njs_djb_hash.c
index 77fa34f95fa00448a892bb26c895548f25ddd238..51d6b74d1b697fd94d21003cc9011b91f5a6ef2d 100644 (file)
--- a/src/njs_djb_hash.c
+++ b/src/njs_djb_hash.c
@@ -8,7 +8,6 @@
 #include <njs_types.h>
 #include <njs_clang.h>
 #include <njs_str.h>
-#include <njs_stub.h>
 #include <njs_djb_hash.h>
 
 

diff --git a/src/njs_lvlhsh.c b/src/njs_lvlhsh.c
index 090b750b88db27b786628f601581c9512057063a..a864b6f8cb2ba22f7be8ed640f98f1e56c905c59 100644 (file)
--- a/src/njs_lvlhsh.c
+++ b/src/njs_lvlhsh.c
@@ -8,7 +8,6 @@
 #include <njs_types.h>
 #include <njs_clang.h>
 #include <njs_str.h>
-#include <njs_stub.h>
 #include <njs_lvlhsh.h>
 #include <string.h>
 

diff --git a/src/njs_main.h b/src/njs_main.h
index 55a13113c5f9a9c76229fbf2db2b81a02d34a506..c5fdc820a46df2edc35176b6f3c34089de954889 100644 (file)
--- a/src/njs_main.h
+++ b/src/njs_main.h
@@ -14,7 +14,6 @@
 #include <njs_types.h>
 #include <njs_clang.h>
 #include <njs_str.h>
-#include <njs_stub.h>
 #include <njs_utf8.h>
 #include <njs_dtoa.h>
 #include <njs_strtod.h>

diff --git a/src/njs_mp.c b/src/njs_mp.c
index 136e20aee3188ccfd927281332aaa29b8dec0fe8..7124c6f6a82882b58acfa7ccb54a5729307f1562 100644 (file)
--- a/src/njs_mp.c
+++ b/src/njs_mp.c
@@ -7,7 +7,6 @@
 #include <njs_auto_config.h>
 #include <njs_types.h>
 #include <njs_clang.h>
-#include <njs_stub.h>
 #include <njs_str.h>
 #include <njs_sprintf.h>
 #include <njs_malloc.h>

diff --git a/src/njs_pcre.c b/src/njs_pcre.c
index 92ca3a5315f6e39e0f523cfc16d76b5558c5be6d..b320d21d049cd2e391fe05bb702a55642321c7bd 100644 (file)
--- a/src/njs_pcre.c
+++ b/src/njs_pcre.c
@@ -7,7 +7,6 @@
 #include <njs_auto_config.h>
 #include <njs_types.h>
 #include <njs_clang.h>
-#include <njs_stub.h>
 #include <njs_trace.h>
 #include <njs_str.h>
 #include <njs_regex.h>

diff --git a/src/njs_sprintf.c b/src/njs_sprintf.c
index 7ac863d2601a35f8810ce97e214502b9b876f272..ca7ef528ca9e11ff00ade6eed4b7a6fe722ab89b 100644 (file)
--- a/src/njs_sprintf.c
+++ b/src/njs_sprintf.c
@@ -7,7 +7,6 @@
 #include <njs_auto_config.h>
 #include <njs_types.h>
 #include <njs_clang.h>
-#include <njs_stub.h>
 #include <njs_str.h>
 #include <njs_sprintf.h>
 

diff --git a/src/njs_stub.h b/src/njs_stub.h
deleted file mode 100644 (file)
index f4f4149..0000000
--- a/src/njs_stub.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-/*
- * Copyright (C) Igor Sysoev
- * Copyright (C) NGINX, Inc.
- */
-
-#ifndef _NJS_STUB_H_INCLUDED_
-#define _NJS_STUB_H_INCLUDED_
-
-
-#define njs_max(val1, val2)                                                   \
-    ((val1 < val2) ? (val2) : (val1))
-
-#define njs_min(val1, val2)                                                   \
-    ((val1 < val2) ? (val1) : (val2))
-
-
-#define NJS_OK             0
-#define NJS_ERROR          (-1)
-#define NJS_AGAIN          (-2)
-#define NJS_DECLINED       (-3)
-#define NJS_DONE           (-4)
-
-
-#define njs_thread_log_alert(...)
-#define njs_thread_log_error(...)
-#define njs_log_error(...)
-#define njs_thread_log_debug(...)
-
-#include <unistd.h>
-#define njs_pagesize()      getpagesize()
-
-
-#endif /* _NJS_STUB_H_INCLUDED_ */

diff --git a/src/njs_trace.h b/src/njs_trace.h
index ed32c1a3523d7f13bf2632847bfe78cb2a1a639e..2bae4cefc82e15b048ef1f3ab95190189308f180 100644 (file)
--- a/src/njs_trace.h
+++ b/src/njs_trace.h
@@ -61,6 +61,12 @@ struct njs_trace_s {
     } while (0)
 
 
+#define njs_thread_log_alert(...)
+#define njs_thread_log_error(...)
+#define njs_log_error(...)
+#define njs_thread_log_debug(...)
+
+
 NJS_EXPORT void njs_trace_handler(njs_trace_t *trace, uint32_t level,
     const char *fmt, ...);
 

diff --git a/src/njs_types.h b/src/njs_types.h
index d0fd4bc3053b80343e105147113c11a3f6c73d56..a47e2391f48df2973aade48d97afe9cf8b0b4378 100644 (file)
--- a/src/njs_types.h
+++ b/src/njs_types.h
@@ -8,6 +8,13 @@
 #define _NJS_TYPES_H_INCLUDED_
 
 
+#define NJS_OK             0
+#define NJS_ERROR          (-1)
+#define NJS_AGAIN          (-2)
+#define NJS_DECLINED       (-3)
+#define NJS_DONE           (-4)
+
+
 /*
  * off_t is 32 bit on Linux, Solaris and HP-UX by default.
  * Must be before <sys/types.h>.

diff --git a/src/njs_unix.h b/src/njs_unix.h
index 10bdbacddc8461040c988beb860964f81d961557..9a833e153cca234f85d06fdd196fade81ac8a588 100644 (file)
--- a/src/njs_unix.h
+++ b/src/njs_unix.h
@@ -8,6 +8,9 @@
 #ifndef _NJS_UNIX_H_INCLUDED_
 #define _NJS_UNIX_H_INCLUDED_
 
+#include <unistd.h>
+#define njs_pagesize()      getpagesize()
+
 #if (NJS_LINUX)
 
 #ifdef _FORTIFY_SOURCE

diff --git a/src/test/lvlhsh_unit_test.c b/src/test/lvlhsh_unit_test.c
index c4c3c996f7b187eda00d53ff4f33bdf3a8518d31..748e3014a43c2e541395ae393896438444b64642 100644 (file)
--- a/src/test/lvlhsh_unit_test.c
+++ b/src/test/lvlhsh_unit_test.c
@@ -9,7 +9,6 @@
 #include <njs_clang.h>
 #include <njs_sprintf.h>
 #include <njs_str.h>
-#include <njs_stub.h>
 #include <njs_malloc.h>
 #include <njs_lvlhsh.h>
 #include <njs_murmur_hash.h>

diff --git a/src/test/random_unit_test.c b/src/test/random_unit_test.c
index 2e3d83350c70bf5f9ee10c680550edc3b71bd035..fc1cd6ff8f0074d944fb47d3e25e55c7aef6d7e4 100644 (file)
--- a/src/test/random_unit_test.c
+++ b/src/test/random_unit_test.c
@@ -9,7 +9,6 @@
 #include <njs_clang.h>
 #include <njs_sprintf.h>
 #include <njs_str.h>
-#include <njs_stub.h>
 #include <njs_random.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/test/rbtree_unit_test.c b/src/test/rbtree_unit_test.c
index d3d141a503b91bb5f1c85a0edd4337c286c7ad4d..0c9a50c99442436c5dd10a98201c6a74bf754c80 100644 (file)
--- a/src/test/rbtree_unit_test.c
+++ b/src/test/rbtree_unit_test.c
@@ -7,7 +7,6 @@
 #include <njs_auto_config.h>
 #include <njs_types.h>
 #include <njs_clang.h>
-#include <njs_stub.h>
 #include <njs_sprintf.h>
 #include <njs_str.h>
 #include <njs_rbtree.h>

diff --git a/src/test/utf8_unit_test.c b/src/test/utf8_unit_test.c
index f82c02db4892f4d5b705825040eed7ecbbce0a66..0ec71a7e70a755980017ac944e0643ef04460ee4 100644 (file)
--- a/src/test/utf8_unit_test.c
+++ b/src/test/utf8_unit_test.c
@@ -9,7 +9,6 @@
 #include <njs_clang.h>
 #include <njs_sprintf.h>
 #include <njs_str.h>
-#include <njs_stub.h>
 #include <njs_utf8.h>
 #include <string.h>