[nginx] svn commit: r4565 - trunk/src/os/win32

mdounin at mdounin.ru mdounin at mdounin.ru
Wed Mar 28 13:04:40 UTC 2012


Author: mdounin
Date: 2012-03-28 13:04:39 +0000 (Wed, 28 Mar 2012)
New Revision: 4565
URL: http://trac.nginx.org/nginx/changeset/4565/nginx

Log:
Fixed win32 build after realpath changes in r4559.


Modified:
   trunk/src/os/win32/ngx_files.c
   trunk/src/os/win32/ngx_files.h

Modified: trunk/src/os/win32/ngx_files.c
===================================================================
--- trunk/src/os/win32/ngx_files.c	2012-03-28 12:38:03 UTC (rev 4564)
+++ trunk/src/os/win32/ngx_files.c	2012-03-28 13:04:39 UTC (rev 4565)
@@ -426,11 +426,11 @@
 }
 
 
-char *
+u_char *
 ngx_realpath(u_char *path, u_char *resolved)
 {
     /* STUB */
-    return (char *) path;
+    return path;
 }
 
 

Modified: trunk/src/os/win32/ngx_files.h
===================================================================
--- trunk/src/os/win32/ngx_files.h	2012-03-28 12:38:03 UTC (rev 4564)
+++ trunk/src/os/win32/ngx_files.h	2012-03-28 13:04:39 UTC (rev 4565)
@@ -177,7 +177,7 @@
 #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()"



More information about the nginx-devel mailing list