summaryrefslogtreecommitdiffhomepage
path: root/src/os/win32
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/os/win32/ngx_gui.c8
-rw-r--r--src/os/win32/ngx_gui.h6
-rw-r--r--src/os/win32/ngx_user.c22
-rw-r--r--src/os/win32/ngx_user.h4
-rw-r--r--src/os/win32/ngx_win32_config.h10
5 files changed, 42 insertions, 8 deletions
diff --git a/src/os/win32/ngx_gui.c b/src/os/win32/ngx_gui.c
index 5673820d2..36d3c49d2 100644
--- a/src/os/win32/ngx_gui.c
+++ b/src/os/win32/ngx_gui.c
@@ -11,8 +11,8 @@
#define NGX_MAX_TEXT 2048
-void ngx_message_box(char *title, ngx_uint_t type, ngx_err_t err,
- const char *fmt, ...)
+void ngx_cdecl ngx_message_box(char *title, ngx_uint_t type, ngx_err_t err,
+ const char *fmt, ...)
{
va_list args;
u_char text[NGX_MAX_TEXT], *p, *last;
@@ -59,8 +59,8 @@ void ngx_message_box(char *title, ngx_uint_t type, ngx_err_t err,
}
-ngx_int_t ngx_system_tray_icon(HWND window, u_long action,
- HICON icon, u_char *tip)
+ngx_int_t
+ngx_system_tray_icon(HWND window, u_long action, HICON icon, u_char *tip)
{
NOTIFYICONDATA ni;
diff --git a/src/os/win32/ngx_gui.h b/src/os/win32/ngx_gui.h
index e44e6aa15..0bff21c09 100644
--- a/src/os/win32/ngx_gui.h
+++ b/src/os/win32/ngx_gui.h
@@ -13,11 +13,11 @@
#include <ngx_gui_resources.h>
-void ngx_message_box(char *title, ngx_uint_t type, ngx_err_t err,
- const char *fmt, ...);
+void ngx_cdecl ngx_message_box(char *title, ngx_uint_t type, ngx_err_t err,
+ const char *fmt, ...);
ngx_int_t ngx_system_tray_icon(HWND window, u_long action,
- HICON icon, u_char *tip);
+ HICON icon, u_char *tip);
#endif /* _NGX_GUI_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_user.c b/src/os/win32/ngx_user.c
new file mode 100644
index 000000000..cc0760301
--- /dev/null
+++ b/src/os/win32/ngx_user.c
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) Igor Sysoev
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+#if (NGX_CRYPT)
+
+ngx_int_t
+ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
+{
+ /* STUB: a plain text password */
+
+ *encrypted = key;
+
+ return NGX_OK;
+}
+
+#endif /* NGX_CRYPT */
diff --git a/src/os/win32/ngx_user.h b/src/os/win32/ngx_user.h
index 452daa161..6e8c58bd2 100644
--- a/src/os/win32/ngx_user.h
+++ b/src/os/win32/ngx_user.h
@@ -17,4 +17,8 @@
#define ngx_gid_t ngx_int_t
+ngx_int_t ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt,
+ u_char **encrypted);
+
+
#endif /* _NGX_USER_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h
index 02d4db5c6..f49a16c96 100644
--- a/src/os/win32/ngx_win32_config.h
+++ b/src/os/win32/ngx_win32_config.h
@@ -93,15 +93,23 @@
#define ngx_inline __inline
+#define ngx_cdecl __cdecl
#ifdef _MSC_VER
typedef unsigned __int32 uint32_t;
typedef __int32 int32_t;
+#define ngx_libc_cdecl __cdecl
-#else /* __WATCOMC__ and __BORLANDC__ */
+#elif defined __WATCOMC__
typedef unsigned int uint32_t;
typedef int int32_t;
+#define ngx_libc_cdecl
+
+#else /* __BORLANDC__ */
+typedef unsigned int uint32_t;
+typedef int int32_t;
+#define ngx_libc_cdecl __cdecl
#endif
typedef __int64 int64_t;