]> git.kaiwu.me - nginx.git/commitdiff
Fixed win32 build after realpath changes in r4559.
authorMaxim Dounin <mdounin@mdounin.ru>
Wed, 28 Mar 2012 13:04:39 +0000 (13:04 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Wed, 28 Mar 2012 13:04:39 +0000 (13:04 +0000)
src/os/win32/ngx_files.c
src/os/win32/ngx_files.h

index ebb06a0d566c463513da5f23ca0e2f4e4dee7450..6775dc70f9e6c02e38a1ff1dd6120ea3e704663c 100644 (file)
@@ -426,11 +426,11 @@ ngx_close_file_mapping(ngx_file_mapping_t *fm)
 }
 
 
-char *
+u_char *
 ngx_realpath(u_char *path, u_char *resolved)
 {
     /* STUB */
-    return (char *) path;
+    return path;
 }
 
 
index f567f190bf2f0034b9aff743d6837f024d97dd46..a4624738f9f05056531b9af493fd4a1c30bdd590 100644 (file)
@@ -177,7 +177,7 @@ void ngx_close_file_mapping(ngx_file_mapping_t *fm);
 #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()"