svn: /php/php-src/ branches/PHP_5_3/ext/standard/link_win32.c trunk/ext/standard/link_win32.c

pajoye Thu, 27 Aug 2009 14:45:41 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=287813 Log: - fix VC6 build Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/link_win32.c U php/php-src/trunk/ext/standard/link_win32.c Modified: php/php-src/branches/PHP_5_3/ext/standard/link_win32.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/link_win32.c 2009-08-27 14:18:36 UTC (rev 287812) +++ php/php-src/branches/PHP_5_3/ext/standard/link_win32.c 2009-08-27 14:45:41 UTC (rev 287813) @@ -55,6 +55,10 @@ #define VOLUME_NAME_NT 0x2 #endif +#ifndef VOLUME_NAME_DOS +#define VOLUME_NAME_DOS 0x0 +#endif + /* {{{ proto string readlink(string filename) Return the target of a symbolic link */ PHP_FUNCTION(readlink) @@ -120,7 +124,7 @@ if(dwRet > 4) { /* Skip first 4 characters if they are "\??\" */ - if(Path[0] == '\\' && Path[0] == '\\' && Path[1] == '?' && Path[2] == '?' && Path[3] == '\\') { + if(Path[0] == '\\' && Path[1] == '\\' && Path[2] == '?' && Path[3] == '\\') { RETURN_STRING(Path + 4, 1); } } else { Modified: php/php-src/trunk/ext/standard/link_win32.c =================================================================== --- php/php-src/trunk/ext/standard/link_win32.c 2009-08-27 14:18:36 UTC (rev 287812) +++ php/php-src/trunk/ext/standard/link_win32.c 2009-08-27 14:45:41 UTC (rev 287813) @@ -54,6 +54,10 @@ #define VOLUME_NAME_NT 0x2 #endif +#ifndef VOLUME_NAME_DOS +#define VOLUME_NAME_DOS 0x0 +#endif + /* {{{ proto string readlink(string filename) Return the target of a symbolic link */ PHP_FUNCTION(readlink) @@ -119,7 +123,7 @@ if(dwRet > 4) { /* Skip first 4 characters if they are "\??\" */ - if(Path[0] == '\\' && Path[0] == '\\' && Path[1] == '?' && Path[2] == '?' && Path[3] == '\\') { + if(Path[0] == '\\' && Path[1] == '\\' && Path[2] == '?' && Path[3] == '\\') { RETURN_STRING(Path + 4, 1); } } else {