aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_string.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/ngx_string.h')
-rw-r--r--src/core/ngx_string.h28
1 files changed, 7 insertions, 21 deletions
diff --git a/src/core/ngx_string.h b/src/core/ngx_string.h
index 670063915..15650009c 100644
--- a/src/core/ngx_string.h
+++ b/src/core/ngx_string.h
@@ -24,29 +24,12 @@ typedef struct {
} ngx_keyval_t;
-#define ngx_string(str) { sizeof(str) - 1, (u_char *) str }
-#define ngx_null_string { 0, NULL }
+#define ngx_string(str) { sizeof(str) - 1, (u_char *) str }
+#define ngx_null_string { 0, NULL }
-#define ngx_tolower(c) (u_char) ((c >= 'A' && c <= 'Z') ? (c | 0x20) : c)
-#define ngx_toupper(c) (u_char) ((c >= 'a' && c <= 'z') ? (c & ~0x20) : c)
-
-
-#if (NGX_WIN32)
-
-#define ngx_strncasecmp(s1, s2, n) \
- strnicmp((const char *) s1, (const char *) s2, n)
-#define ngx_strcasecmp(s1, s2) \
- stricmp((const char *) s1, (const char *) s2)
-
-#else
-
-#define ngx_strncasecmp(s1, s2, n) \
- strncasecmp((const char *) s1, (const char *) s2, n)
-#define ngx_strcasecmp(s1, s2) \
- strcasecmp((const char *) s1, (const char *) s2)
-
-#endif
+#define ngx_tolower(c) (u_char) ((c >= 'A' && c <= 'Z') ? (c | 0x20) : c)
+#define ngx_toupper(c) (u_char) ((c >= 'a' && c <= 'z') ? (c & ~0x20) : c)
#define ngx_strncmp(s1, s2, n) strncmp((const char *) s1, (const char *) s2, n)
@@ -128,6 +111,9 @@ u_char * ngx_cdecl ngx_sprintf(u_char *buf, const char *fmt, ...);
u_char * ngx_cdecl ngx_snprintf(u_char *buf, size_t max, const char *fmt, ...);
u_char *ngx_vsnprintf(u_char *buf, size_t max, const char *fmt, va_list args);
+ngx_int_t ngx_strcasecmp(u_char *s1, u_char *s2);
+ngx_int_t ngx_strncasecmp(u_char *s1, u_char *s2, size_t n);
+
ngx_int_t ngx_rstrncmp(u_char *s1, u_char *s2, size_t n);
ngx_int_t ngx_rstrncasecmp(u_char *s1, u_char *s2, size_t n);
ngx_int_t ngx_memn2cmp(u_char *s1, u_char *s2, size_t n1, size_t n2);