From 8ed283d697ce7e8fabc03e529bb6a9a330303bac Mon Sep 17 00:00:00 2001
From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Fri, 2 Aug 2019 12:12:35 +0300
Subject: [PATCH] Removing njs_stub.h.

---
 src/njs.h                   |  1 -
 src/njs_clang.h             |  6 ++++++
 src/njs_djb_hash.c          |  1 -
 src/njs_lvlhsh.c            |  1 -
 src/njs_main.h              |  1 -
 src/njs_mp.c                |  1 -
 src/njs_pcre.c              |  1 -
 src/njs_sprintf.c           |  1 -
 src/njs_stub.h              | 34 ----------------------------------
 src/njs_trace.h             |  6 ++++++
 src/njs_types.h             |  7 +++++++
 src/njs_unix.h              |  3 +++
 src/test/lvlhsh_unit_test.c |  1 -
 src/test/random_unit_test.c |  1 -
 src/test/rbtree_unit_test.c |  1 -
 src/test/utf8_unit_test.c   |  1 -
 16 files changed, 22 insertions(+), 45 deletions(-)
 delete mode 100644 src/njs_stub.h

diff --git a/src/njs.h b/src/njs.h
index deb06f7d..c72a9969 100644
--- 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 3356ec19..04b07ff5 100644
--- 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 77fa34f9..51d6b74d 100644
--- 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 090b750b..a864b6f8 100644
--- 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 55a13113..c5fdc820 100644
--- 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 136e20ae..7124c6f6 100644
--- 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 92ca3a53..b320d21d 100644
--- 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 7ac863d2..ca7ef528 100644
--- 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
index f4f4149e..00000000
--- 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 ed32c1a3..2bae4cef 100644
--- 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 d0fd4bc3..a47e2391 100644
--- 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 10bdbacd..9a833e15 100644
--- 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 c4c3c996..748e3014 100644
--- 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 2e3d8335..fc1cd6ff 100644
--- 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 d3d141a5..0c9a50c9 100644
--- 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 f82c02db..0ec71a7e 100644
--- 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>
 
-- 
2.47.3