Mercurial > hg > nginx

changeset 4564:13eb3193cd63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed win32 build after realpath changes in r4559.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 28 Mar 2012 13:04:39 +0000
parents cc038cc834be
children 2b22743c3079
files src/os/win32/ngx_files.c src/os/win32/ngx_files.h
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -426,11 +426,11 @@ ngx_close_file_mapping(ngx_file_mapping_
 }
 
 
-char *
+u_char *
 ngx_realpath(u_char *path, u_char *resolved)
 {
     /* STUB */
-    return (char *) path;
+    return path;
 }
 
 
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -177,7 +177,7 @@ void ngx_close_file_mapping(ngx_file_map
 #define ngx_filename_cmp(s1, s2, n) _strnicmp((char *) s1, (char *) s2, n)
 
 
-char *ngx_realpath(u_char *path, u_char *resolved);
+u_char *ngx_realpath(u_char *path, u_char *resolved);
 #define ngx_realpath_n              ""
 #define ngx_getcwd(buf, size)       GetCurrentDirectory(size, (char *) buf)
 #define ngx_getcwd_n                "GetCurrentDirectory()"