Public header cleanup.

diff --git a/src/njs.h b/src/njs.h
index 1ee48eabb38a28f76c65cd2a99a53e8c8bea5306..0a051fc79e63bb7f5fe4b54ef20674b0100e7bd2 100644 (file)
--- a/src/njs.h
+++ b/src/njs.h
@@ -15,7 +15,7 @@
 #define NJS_VERSION_NUMBER          0x000800
 
 
-#include <unistd.h>                 /* STDOUT_FILENO, STDERR_FILENO */
+#include <string.h>
 #include <njs_types.h>
 #include <njs_clang.h>
 #include <njs_str.h>
@@ -23,7 +23,6 @@
 #include <njs_utf8.h>
 #include <njs_mp.h>
 #include <njs_chb.h>
-#include <njs_lvlhsh.h>
 #include <njs_sprintf.h>
 
 
@@ -396,7 +395,6 @@ NJS_EXPORT njs_int_t njs_vm_value(njs_vm_t *vm, const njs_str_t *path,
     njs_value_t *retval);
 NJS_EXPORT njs_function_t *njs_vm_function(njs_vm_t *vm, const njs_str_t *name);
 
-NJS_EXPORT njs_value_t *njs_vm_retval(njs_vm_t *vm);
 NJS_EXPORT void njs_vm_throw(njs_vm_t *vm, const njs_value_t *value);
 NJS_EXPORT void njs_vm_error(njs_vm_t *vm, const char *fmt, ...);
 NJS_EXPORT void njs_vm_exception_get(njs_vm_t *vm, njs_value_t *retval);

diff --git a/src/njs_sprintf.h b/src/njs_sprintf.h
index 7a44a32f828ee2d58b4c02ccd8f874b931c1a1ba..ff0b00160ee4fa36bd4fc8ebe65055a0e5012fc0 100644 (file)
--- a/src/njs_sprintf.h
+++ b/src/njs_sprintf.h
@@ -16,12 +16,12 @@ NJS_EXPORT int njs_dprint(int fd, u_char *buf, size_t size);
 NJS_EXPORT int njs_dprintf(int fd, const char *fmt, ...);
 
 #define njs_print(buf, size)                                                 \
-    njs_dprint(STDOUT_FILENO, (u_char *) buf, size)
+    njs_dprint(1 /* STDOUT_FILENO */, (u_char *) buf, size)
 
 #define njs_printf(fmt, ...)                                                 \
-    njs_dprintf(STDOUT_FILENO, fmt, ##__VA_ARGS__)
+    njs_dprintf(1 /* STDOUT_FILENO */, fmt, ##__VA_ARGS__)
 
 #define njs_stderror(fmt, ...)                                               \
-    njs_dprintf(STDERR_FILENO, fmt, ##__VA_ARGS__)
+    njs_dprintf(2 /* STDERR_FILENO */, fmt, ##__VA_ARGS__)
 
 #endif /* _NJS_SPRINTF_H_INCLUDED_ */