Moving all common headers into njs_main.h.

diff --git a/src/njs_arr.c b/src/njs_arr.c
index 3a55c9df913e3f7620472e83a831579e9f0a9ee6..bdcfe11c512aac9802fd22143687aa6eeac33150 100644 (file)
--- a/src/njs_arr.c
+++ b/src/njs_arr.c
@@ -4,13 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_mp.h>
-#include <njs_arr.h>
-#include <njs_str.h>
-#include <string.h>
+
+#include <njs_main.h>
 
 
 njs_arr_t *

diff --git a/src/njs_array.c b/src/njs_array.c
index d1bfb172b6ae91d2c32918a542610b8e51f8ac1f..cbdd6e00f889f2296f96e0ef9a82ad90cdb7e10d 100644 (file)
--- a/src/njs_array.c
+++ b/src/njs_array.c
@@ -4,9 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <string.h>
-#include <stdint.h>
 
 
 static njs_int_t njs_array_prototype_slice_copy(njs_vm_t *vm,

diff --git a/src/njs_boolean.c b/src/njs_boolean.c
index 40f0bd7d58032f05d25392f3bf15043af5c80805..a4de1d48ceba21041595daf4b01be9dacfb5be74 100644 (file)
--- a/src/njs_boolean.c
+++ b/src/njs_boolean.c
@@ -4,6 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
 
 

diff --git a/src/njs_builtin.c b/src/njs_builtin.c
index a4bc5e4917958b9c1ce43cd1f533314040431ac6..c04cf3720349ff13117426b38bb7a55ea14a20b5 100644 (file)
--- a/src/njs_builtin.c
+++ b/src/njs_builtin.c
@@ -5,16 +5,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <njs_regexp.h>
-#include <njs_date.h>
-#include <njs_timer.h>
-#include <njs_math.h>
-#include <njs_json.h>
-#include <njs_module.h>
-#include <njs_fs.h>
-#include <njs_crypto.h>
-#include <string.h>
 
 
 typedef struct {

diff --git a/src/njs_crypto.c b/src/njs_crypto.c
index 9aa19ca086f94dc942194022d64939efa0de219d..afef1ff20b9939353e64202ef4df92bf390eb6c1 100644 (file)
--- a/src/njs_crypto.c
+++ b/src/njs_crypto.c
@@ -4,13 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <njs_md5.h>
-#include <njs_sha1.h>
-#include <njs_sha2.h>
-#include <njs_crypto.h>
-#include <string.h>
-#include <math.h>
 
 
 typedef void (*njs_hash_init)(void *ctx);

diff --git a/src/njs_date.c b/src/njs_date.c
index b2adef17e71ae7c42ece31012b6ac4c89e346d60..ea6508c8e9e04b111b6ab27b231159f3fad84b23 100644 (file)
--- a/src/njs_date.c
+++ b/src/njs_date.c
@@ -4,11 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <njs_date.h>
-#include <string.h>
-#include <sys/time.h>
-#include <time.h>
 
 
 /*

diff --git a/src/njs_disassembler.c b/src/njs_disassembler.c
index 6dda9a7a4ceea89a6a890ceafb795f01ab3c5510..57742598cda80355b9312b4e10ff531f78149462 100644 (file)
--- a/src/njs_disassembler.c
+++ b/src/njs_disassembler.c
@@ -4,6 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
 
 

diff --git a/src/njs_diyfp.c b/src/njs_diyfp.c
index 676b6f85c80365f4b4b876d49d9025201552a63c..37ed6906acdbf5b6e86b6219b36eae0dd97f68d8 100644 (file)
--- a/src/njs_diyfp.c
+++ b/src/njs_diyfp.c
@@ -8,9 +8,8 @@
  * and accurately with integers." ACM Sigplan Notices 45.6 (2010): 233-243.
  */
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
+
+#include <njs_main.h>
 #include <njs_diyfp.h>
 
 

diff --git a/src/njs_djb_hash.c b/src/njs_djb_hash.c
index 51d6b74d1b697fd94d21003cc9011b91f5a6ef2d..e7f7167f269ddf63555cad4c2072595baf133552 100644 (file)
--- a/src/njs_djb_hash.c
+++ b/src/njs_djb_hash.c
@@ -4,11 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_str.h>
-#include <njs_djb_hash.h>
+
+#include <njs_main.h>
 
 
 uint32_t

diff --git a/src/njs_dtoa.c b/src/njs_dtoa.c
index 1c3d44538df9224bf137f7db34fb255cd54eee34..70149063a1300e1cb892653d5050ad156b64502a 100644 (file)
--- a/src/njs_dtoa.c
+++ b/src/njs_dtoa.c
@@ -33,16 +33,11 @@
  * THE SOFTWARE.
  */
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_str.h>
+
+#include <njs_main.h>
 #include <njs_diyfp.h>
 #include <njs_dtoa.h>
 
-#include <math.h>
-#include <string.h>
-
 
 njs_inline void
 njs_grisu2_round(char *start, size_t len, uint64_t delta, uint64_t rest,

diff --git a/src/njs_error.c b/src/njs_error.c
index 6d3b1419fbab90f86411ff78a14d404ea32cfa49..97f8c0c7b8de6f858e474a0a82d2de46d8aace80 100644 (file)
--- a/src/njs_error.c
+++ b/src/njs_error.c
@@ -4,9 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <string.h>
-#include <math.h>
 
 
 static const njs_value_t  njs_error_message_string = njs_string("message");

diff --git a/src/njs_event.c b/src/njs_event.c
index a78c5099aa4925b1d8ade6a6eaeca4a5aa1b3e2a..011a666db3ca8ba385404388c5defb17ee97e491 100644 (file)
--- a/src/njs_event.c
+++ b/src/njs_event.c
@@ -4,8 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <string.h>
 
 
 static njs_int_t njs_event_hash_test(njs_lvlhsh_query_t *lhq, void *data);

diff --git a/src/njs_extern.c b/src/njs_extern.c
index 9e835512166e64939369a878e67e9b3f6137ca88..73b952bbb70de557e46a99cb4db7557a1fd2dc26 100644 (file)
--- a/src/njs_extern.c
+++ b/src/njs_extern.c
@@ -4,8 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <string.h>
 
 
 typedef struct njs_extern_part_s  njs_extern_part_t;

diff --git a/src/njs_file.c b/src/njs_file.c
index e71adb171cfbfae0a14a11206c23810c50153d33..210d85de079da4bb3338f281898b4be82c3988af 100644 (file)
--- a/src/njs_file.c
+++ b/src/njs_file.c
@@ -4,13 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_str.h>
-#include <njs_file.h>
 
-#include <string.h>
+#include <njs_main.h>
 
 
 void

diff --git a/src/njs_fs.c b/src/njs_fs.c
index 6858da0253eb711c901c1032791867cab9d201bb..21b38932680963c7927706203e865f9f3b13df93 100644 (file)
--- a/src/njs_fs.c
+++ b/src/njs_fs.c
@@ -4,12 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <njs_fs.h>
-#include <string.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
 
 
 typedef struct {

diff --git a/src/njs_function.c b/src/njs_function.c
index 2d0d363e8fc60e6efadb657d80c890e05902f363..d0dd394d388b9cf74a36794e871d7bf0afea93f6 100644 (file)
--- a/src/njs_function.c
+++ b/src/njs_function.c
@@ -4,8 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <string.h>
 
 
 static njs_function_t *njs_function_copy(njs_vm_t *vm,

diff --git a/src/njs_generator.c b/src/njs_generator.c
index 57dd56cb6f9c580c72153ec8547a242226f58733..7967a14a913e7e4e101d857b5e037099b5b17544 100644 (file)
--- a/src/njs_generator.c
+++ b/src/njs_generator.c
@@ -5,8 +5,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <string.h>
 
 
 typedef struct njs_generator_patch_s   njs_generator_patch_t;

diff --git a/src/njs_json.c b/src/njs_json.c
index 2219c2727e1afc7c451e6f9ce971d047e4fd5ac6..b20b7ba9f666d4626260716990d6c39d217f5dce 100644 (file)
--- a/src/njs_json.c
+++ b/src/njs_json.c
@@ -4,11 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <njs_json.h>
-#include <njs_date.h>
-#include <njs_regexp.h>
-#include <string.h>
 
 
 typedef struct {

diff --git a/src/njs_lexer.c b/src/njs_lexer.c
index 7e9b0839fd8863422035dad15ca53976e2bf3d18..76b840e5e8091e960f147e7a4282660659a138b4 100644 (file)
--- a/src/njs_lexer.c
+++ b/src/njs_lexer.c
@@ -4,8 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <string.h>
 
 
 typedef struct njs_lexer_multi_s  njs_lexer_multi_t;

diff --git a/src/njs_lexer_keyword.c b/src/njs_lexer_keyword.c
index b5c556c26cfd4ba154d1ae7b1e84c420a0087883..c42871124e8dbd41e8141d2643a9a0f67991bd36 100644 (file)
--- a/src/njs_lexer_keyword.c
+++ b/src/njs_lexer_keyword.c
@@ -4,8 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <string.h>
 
 
 static const njs_keyword_t  njs_keywords[] = {

diff --git a/src/njs_lvlhsh.c b/src/njs_lvlhsh.c
index a864b6f8cb2ba22f7be8ed640f98f1e56c905c59..8443a08c808e6683d18ba877eb9f726d36407e1c 100644 (file)
--- a/src/njs_lvlhsh.c
+++ b/src/njs_lvlhsh.c
@@ -4,12 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_str.h>
-#include <njs_lvlhsh.h>
-#include <string.h>
+
+#include <njs_main.h>
 
 
 /*

diff --git a/src/njs_main.h b/src/njs_main.h
index c5fdc820a46df2edc35176b6f3c34089de954889..b8041ce1dff7345b662b57ff3ba9f3ae4550489b 100644 (file)
--- a/src/njs_main.h
+++ b/src/njs_main.h
@@ -18,6 +18,7 @@
 #include <njs_dtoa.h>
 #include <njs_strtod.h>
 #include <njs_djb_hash.h>
+#include <njs_murmur_hash.h>
 #include <njs_trace.h>
 #include <njs_queue.h>
 #include <njs_lvlhsh.h>
@@ -25,27 +26,47 @@
 #include <njs_time.h>
 #include <njs_file.h>
 #include <njs_malloc.h>
+#include <njs_rbtree.h>
 #include <njs_mp.h>
 #include <njs_arr.h>
 #include <njs_sprintf.h>
 
+#include <njs_md5.h>
+#include <njs_sha1.h>
+#include <njs_sha2.h>
+
 #include <njs.h>
 #include <njs_value.h>
+
 #include <njs_vm.h>
 #include <njs_vmcode.h>
 #include <njs_variable.h>
 #include <njs_lexer.h>
 #include <njs_parser.h>
 #include <njs_generator.h>
-#include <njs_function.h>
+
 #include <njs_boolean.h>
 #include <njs_number.h>
 #include <njs_string.h>
 #include <njs_object.h>
 #include <njs_object_hash.h>
 #include <njs_array.h>
+#include <njs_function.h>
 #include <njs_error.h>
+#include <njs_regexp.h>
+#include <njs_regexp_pattern.h>
+#include <njs_date.h>
+
+#include <njs_math.h>
+#include <njs_json.h>
+
+#include <njs_timer.h>
+#include <njs_module.h>
+
+#include <njs_fs.h>
+#include <njs_crypto.h>
 
+#include <njs_builtin.h>
 #include <njs_event.h>
 #include <njs_extern.h>
 #include <njs_module.h>

diff --git a/src/njs_malloc.c b/src/njs_malloc.c
index a3042db3d1ac29f8dbb2b0f7def468e8f09dd3e5..85a09afd81d73f831897d1648b99fc70bc892650 100644 (file)
--- a/src/njs_malloc.c
+++ b/src/njs_malloc.c
@@ -4,13 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_str.h>
-#include <njs_malloc.h>
 
-#include <string.h>
+#include <njs_main.h>
 
 
 void *
@@ -47,9 +42,6 @@ njs_memalign(size_t alignment, size_t size)
         return p;
     }
 
-    // STUB
-    //njs_errno_set(err);
-
     return NULL;
 }
 

diff --git a/src/njs_math.c b/src/njs_math.c
index 55aad4061a30fe1324eae7a51cd1a451633d16ff..b58ba6e6147bc9d57502e17ee670b893428f8cc4 100644 (file)
--- a/src/njs_math.c
+++ b/src/njs_math.c
@@ -4,8 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <math.h>
 
 
 static njs_int_t

diff --git a/src/njs_md5.c b/src/njs_md5.c
index d21358eab35b3cf14b45f0b2893d0a4d73d537e0..4c455b30d63bf27b3ae8ae0a2194ed2b2f4a8d3d 100644 (file)
--- a/src/njs_md5.c
+++ b/src/njs_md5.c
@@ -6,12 +6,7 @@
  */
 
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_md5.h>
-#include <njs_str.h>
-#include <string.h>
+#include <njs_main.h>
 
 
 static const u_char *njs_md5_body(njs_md5_t *ctx, const u_char *data,

diff --git a/src/njs_module.c b/src/njs_module.c
index bd6d9084a3e58d7c1c1092dec0f77e39a811fb70..552770a32185e275041fd5ea28b8bdb1b3b4edf9 100644 (file)
--- a/src/njs_module.c
+++ b/src/njs_module.c
@@ -4,15 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <njs_module.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/param.h>
 
 
 typedef struct {

diff --git a/src/njs_mp.c b/src/njs_mp.c
index 7124c6f6a82882b58acfa7ccb54a5729307f1562..987f052bf60fe69bd5db4e320ce6c1963e2a15b9 100644 (file)
--- a/src/njs_mp.c
+++ b/src/njs_mp.c
@@ -4,17 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_str.h>
-#include <njs_sprintf.h>
-#include <njs_malloc.h>
-#include <njs_queue.h>
-#include <njs_rbtree.h>
-#include <njs_mp.h>
-#include <string.h>
-#include <stdint.h>
+
+#include <njs_main.h>
 
 
 /*

diff --git a/src/njs_murmur_hash.c b/src/njs_murmur_hash.c
index 336f2b75e6d035111893f4a36877048bed38fcb1..f5ee00796c7ffe6da86b17810ada78fc144338c8 100644 (file)
--- a/src/njs_murmur_hash.c
+++ b/src/njs_murmur_hash.c
@@ -4,10 +4,8 @@
  * released to the public domain.
  */
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_murmur_hash.h>
+
+#include <njs_main.h>
 
 
 uint32_t

diff --git a/src/njs_number.c b/src/njs_number.c
index 3e2cb6bc39f3434afcc9df00c5abb44652db5010..260e668c0454a366791e5a5462a43dfc6f8d44e9 100644 (file)
--- a/src/njs_number.c
+++ b/src/njs_number.c
@@ -4,10 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <math.h>
-#include <string.h>
-#include <float.h>
 
 
 /*

diff --git a/src/njs_object.c b/src/njs_object.c
index 7561160bff369ea75532c12a07552f17b103dbad..420f9e63a1c262712ef0e65aa24f143911f7bd90 100644 (file)
--- a/src/njs_object.c
+++ b/src/njs_object.c
@@ -4,8 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <string.h>
 
 
 static njs_int_t njs_object_hash_test(njs_lvlhsh_query_t *lhq, void *data);

diff --git a/src/njs_parser.c b/src/njs_parser.c
index 118c7af97853ccc1788e9b306d58660c51d2f6db..bc701b047e0e9af09b962daf2fc45a0ebbf2f65f 100644 (file)
--- a/src/njs_parser.c
+++ b/src/njs_parser.c
@@ -4,9 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <njs_regexp.h>
-#include <string.h>
 
 
 static njs_int_t njs_parser_scope_begin(njs_vm_t *vm, njs_parser_t *parser,

diff --git a/src/njs_parser_expression.c b/src/njs_parser_expression.c
index b09d3e6b2810d183393cc409ad2203889a486d69..52851758f74ed4ca552afa56b34aa6f394b2f9fd 100644 (file)
--- a/src/njs_parser_expression.c
+++ b/src/njs_parser_expression.c
@@ -4,8 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <string.h>
 
 
 typedef struct {

diff --git a/src/njs_parser_terminal.c b/src/njs_parser_terminal.c
index bdfc49594e5fca43f8ce8d0fc3faca78ce9f821c..a8d002f2770a7d2f9a19d1cd4d5b30c8de11dab9 100644 (file)
--- a/src/njs_parser_terminal.c
+++ b/src/njs_parser_terminal.c
@@ -4,9 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <njs_regexp.h>
-#include <string.h>
 
 
 static njs_parser_node_t *njs_parser_reference(njs_vm_t *vm,

diff --git a/src/njs_pcre.c b/src/njs_pcre.c
index b320d21d049cd2e391fe05bb702a55642321c7bd..92cc5e15bbcefea42f209770487b0e697723c81b 100644 (file)
--- a/src/njs_pcre.c
+++ b/src/njs_pcre.c
@@ -4,14 +4,9 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_trace.h>
-#include <njs_str.h>
-#include <njs_regex.h>
+
+#include <njs_main.h>
 #include <njs_pcre.h>
-#include <string.h>
 
 
 static void *njs_pcre_malloc(size_t size);

diff --git a/src/njs_queue.c b/src/njs_queue.c
index c2ae412df8ab05b08ba3c2dd8394762c0bca5553..fb32316cd72f388b194c7daf99dc9ad5456b804f 100644 (file)
--- a/src/njs_queue.c
+++ b/src/njs_queue.c
@@ -4,10 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_queue.h>
+
+#include <njs_main.h>
 
 
 /*

diff --git a/src/njs_random.c b/src/njs_random.c
index cbfd07b288510a35aeb225d7e37f346430957fc5..0494f52e8db588e659d8cdef5e7320a5429fbcd2 100644 (file)
--- a/src/njs_random.c
+++ b/src/njs_random.c
@@ -5,13 +5,7 @@
  */
 
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_random.h>
-#include <fcntl.h>
-#include <sys/time.h>
-#include <unistd.h>
+#include <njs_main.h>
 #if (NJS_HAVE_GETRANDOM)
 #include <sys/random.h>
 #elif (NJS_HAVE_LINUX_SYS_GETRANDOM)

diff --git a/src/njs_rbtree.c b/src/njs_rbtree.c
index c856121e1969d7f4bfd2555c63a38bf608ba663d..f7d8bf16da1017836c9c792311169ab3147e6617 100644 (file)
--- a/src/njs_rbtree.c
+++ b/src/njs_rbtree.c
@@ -4,10 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_rbtree.h>
+
+#include <njs_main.h>
 
 
 /*

diff --git a/src/njs_regexp.c b/src/njs_regexp.c
index 3697a631f08556cd5b5aea92134afd703664e48c..1f49db8e97fe6fcc03467e7f65a001a7cf92f68e 100644 (file)
--- a/src/njs_regexp.c
+++ b/src/njs_regexp.c
@@ -4,11 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <njs_main.h>
-#include <njs_regexp.h>
-#include <njs_regexp_pattern.h>
 
-#include <string.h>
+#include <njs_main.h>
 
 
 struct njs_regexp_group_s {

diff --git a/src/njs_sha1.c b/src/njs_sha1.c
index 79abb60308a2ef4fd3717252b2e5d2322410d45d..fdadec2b1cc8062a60e0152ed8c6fbc7d4d29cc3 100644 (file)
--- a/src/njs_sha1.c
+++ b/src/njs_sha1.c
@@ -7,12 +7,7 @@
  */
 
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_sha1.h>
-#include <njs_str.h>
-#include <string.h>
+#include <njs_main.h>
 
 
 static const u_char *njs_sha1_body(njs_sha1_t *ctx, const u_char *data,

diff --git a/src/njs_sha2.c b/src/njs_sha2.c
index 7b1bf93dd9e5fde87a8bd8e6775ec45fcf5cd54f..6beba26078c602d8dfc68d30fab4e959964b0c1c 100644 (file)
--- a/src/njs_sha2.c
+++ b/src/njs_sha2.c
@@ -7,12 +7,7 @@
  */
 
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_sha2.h>
-#include <njs_str.h>
-#include <string.h>
+#include <njs_main.h>
 
 
 static const u_char *njs_sha2_body(njs_sha2_t *ctx, const u_char *data,

diff --git a/src/njs_shell.c b/src/njs_shell.c
index f70ec284f4636f3e479a74103413ec2c7f0c5bb6..c28e3394ddb53aae5db6675e5d075f7c34dd75c9 100644 (file)
--- a/src/njs_shell.c
+++ b/src/njs_shell.c
@@ -6,17 +6,7 @@
 
 
 #include <njs_main.h>
-#include <njs_builtin.h>
-#include <time.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/param.h>
 #include <locale.h>
-
-#include <stdio.h>
 #if (NJS_HAVE_EDITLINE)
 #include <editline/readline.h>
 #elif (NJS_HAVE_EDIT_READLINE)

diff --git a/src/njs_sprintf.c b/src/njs_sprintf.c
index ca7ef528ca9e11ff00ade6eed4b7a6fe722ab89b..1f7358e888fe95e4327888c9d8aac70ba37556aa 100644 (file)
--- a/src/njs_sprintf.c
+++ b/src/njs_sprintf.c
@@ -4,15 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_str.h>
-#include <njs_sprintf.h>
 
-#include <math.h>
-#include <float.h>
-#include <string.h>
+#include <njs_main.h>
 
 
 /*
@@ -80,7 +73,7 @@ typedef struct {
 
 
 static u_char *njs_integer(njs_sprintf_t *spf, u_char *buf, uint64_t ui64);
-static u_char *njs_number(njs_sprintf_t *spf, u_char *buf, double n);
+static u_char *njs_float(njs_sprintf_t *spf, u_char *buf, double n);
 
 
 /* A right way of "f == 0.0". */
@@ -340,7 +333,7 @@ njs_vsprintf(u_char *buf, u_char *end, const char *fmt, va_list args)
                 }
             }
 
-            buf = njs_number(&spf, buf, i);
+            buf = njs_float(&spf, buf, i);
 
             if (spf.frac_width > 0) {
 
@@ -546,7 +539,7 @@ njs_integer(njs_sprintf_t *spf, u_char *buf, uint64_t ui64)
 
 
 static u_char *
-njs_number(njs_sprintf_t *spf, u_char *buf, double n)
+njs_float(njs_sprintf_t *spf, u_char *buf, double n)
 {
     u_char  *p, *end;
     size_t  length;

diff --git a/src/njs_string.c b/src/njs_string.c
index 053d4407ce51911e2d00dd5af00e723071d28f69..e1bd5013ea80afe5b3b01818fea6f81234f07613 100644 (file)
--- a/src/njs_string.c
+++ b/src/njs_string.c
@@ -4,10 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <njs_regexp.h>
-#include <njs_regexp_pattern.h>
-#include <string.h>
 
 
 #define NJS_TRIM_START  1

diff --git a/src/njs_strtod.c b/src/njs_strtod.c
index 9fd8cbf11304b4913a4ec54261bee156f8da458a..898cebe49756451a905699a2c2cc57e1a3ce93ec 100644 (file)
--- a/src/njs_strtod.c
+++ b/src/njs_strtod.c
@@ -7,11 +7,8 @@
  * that can be found in the LICENSE file.
  */
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
+#include <njs_main.h>
 #include <njs_diyfp.h>
-#include <njs_strtod.h>
 
 /*
  * Max double: 1.7976931348623157 x 10^308

diff --git a/src/njs_time.c b/src/njs_time.c
index cdca7e895120dc613271bd0b8dac381e79c070d4..68733c73324859efda979a164238a6fe71cf42bd 100644 (file)
--- a/src/njs_time.c
+++ b/src/njs_time.c
@@ -4,13 +4,9 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_time.h>
 
-#include <time.h>
-#include <sys/time.h>
+#include <njs_main.h>
+
 
 uint64_t
 njs_time(void)

diff --git a/src/njs_timer.c b/src/njs_timer.c
index 148ab9d21fe01e2df41051771e60874fdeb843d2..96bb99de84c7d7928957bc75a839d3d14edfb71a 100644 (file)
--- a/src/njs_timer.c
+++ b/src/njs_timer.c
@@ -4,9 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <njs_timer.h>
-#include <string.h>
 
 
 static njs_int_t

diff --git a/src/njs_trace.c b/src/njs_trace.c
index 9b8c19cc8060fa34a20ed11eff55c3631acf04bc..8f4188605327ae70c8e4f845e169fc95c1797e2d 100644 (file)
--- a/src/njs_trace.c
+++ b/src/njs_trace.c
@@ -4,12 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_malloc.h>
-#include <njs_sprintf.h>
-#include <njs_trace.h>
+
+#include <njs_main.h>
 
 
 static u_char *

diff --git a/src/njs_unix.h b/src/njs_unix.h
index 9a833e153cca234f85d06fdd196fade81ac8a588..442cf8b60b213c551dde94a4cfb757a43e370936 100644 (file)
--- a/src/njs_unix.h
+++ b/src/njs_unix.h
@@ -8,7 +8,6 @@
 #ifndef _NJS_UNIX_H_INCLUDED_
 #define _NJS_UNIX_H_INCLUDED_
 
-#include <unistd.h>
 #define njs_pagesize()      getpagesize()
 
 #if (NJS_LINUX)
@@ -23,4 +22,21 @@
 
 #endif /* NJS_LINUX */
 
+#include <errno.h>
+#include <stdarg.h>
+#include <stddef.h>                 /* offsetof() */
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <math.h>
+#include <float.h>
+#include <time.h>
+#include <fcntl.h>
+
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <sys/param.h>
+
+#include <unistd.h>
+
 #endif /* _NJS_UNIX_H_INCLUDED_ */

diff --git a/src/njs_utf8.c b/src/njs_utf8.c
index bb697fe3f9033275b7f2300030b78b1a673783da..51baa490e2943b996c933c8805950d09f35577aa 100644 (file)
--- a/src/njs_utf8.c
+++ b/src/njs_utf8.c
@@ -4,10 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <njs_auto_config.h>
-#include <njs_types.h>
-#include <njs_clang.h>
-#include <njs_utf8.h>
+
+#include <njs_main.h>
 
 /*
  * The njs_unicode_lower_case.h and njs_unicode_upper_case.h files are

diff --git a/src/njs_value.c b/src/njs_value.c
index 6d300235da1b738f7a22c49aaba68bb019e20b63..371ea9d351e2b19ac63ef8037eb88da3e1667865 100644 (file)
--- a/src/njs_value.c
+++ b/src/njs_value.c
@@ -4,8 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <string.h>
 
 
 const njs_value_t  njs_value_null =         njs_value(NJS_NULL, 0, 0.0);

diff --git a/src/njs_variable.c b/src/njs_variable.c
index 1de625990dcf7c5638fcb6be2811c420eb492342..392a6672cca9b0ee24f71842803cd6fedd9bf840 100644 (file)
--- a/src/njs_variable.c
+++ b/src/njs_variable.c
@@ -5,8 +5,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <string.h>
 
 
 static njs_variable_t *njs_variable_scope_add(njs_vm_t *vm,

diff --git a/src/njs_vm.c b/src/njs_vm.c
index e923f5b21db0f364453156955e32ae519d3e551c..158a11246e99cb99741eeedcdd770e645d4964ed 100644 (file)
--- a/src/njs_vm.c
+++ b/src/njs_vm.c
@@ -4,9 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <njs_regexp.h>
-#include <string.h>
 
 
 static njs_int_t njs_vm_init(njs_vm_t *vm);

diff --git a/src/njs_vmcode.c b/src/njs_vmcode.c
index 8c655ed44ef8bc3b127b9150d08953971005eb96..782cae8562dccf30b5f2b12395f654b6548b2cbe 100644 (file)
--- a/src/njs_vmcode.c
+++ b/src/njs_vmcode.c
@@ -4,9 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
 #include <njs_main.h>
-#include <njs_regexp.h>
-#include <string.h>
 
 
 struct njs_property_next_s {