pajoye Sat, 11 Sep 2010 19:07:43 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=303280
Log:
- remove dummy wrapper for readfile
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/config.w32
U php/php-src/branches/PHP_5_3/win32/php5dll.dsp
U php/php-src/branches/PHP_5_3/win32/php5dllts.dsp
D php/php-src/branches/PHP_5_3/win32/wfile.c
D php/php-src/branches/PHP_5_3/win32/wfile.h
U php/php-src/trunk/win32/build/config.w32
U php/php-src/trunk/win32/php5dll.dsp
U php/php-src/trunk/win32/php5dllts.dsp
D php/php-src/trunk/win32/wfile.c
D php/php-src/trunk/win32/wfile.h
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===================================================================
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2010-09-11 18:22:17 UTC
(rev 303279)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2010-09-11 19:07:43 UTC
(rev 303280)
@@ -349,7 +349,7 @@
userspace.c transports.c xp_socket.c mmap.c glob_wrapper.c");
ADD_SOURCES("win32", "glob.c readdir.c \
- registry.c select.c sendmail.c time.c wfile.c winutil.c wsyslog.c
globals.c");
+ registry.c select.c sendmail.c time.c winutil.c wsyslog.c globals.c");
STDOUT.WriteBlankLines(1);
Modified: php/php-src/branches/PHP_5_3/win32/php5dll.dsp
===================================================================
(Binary files differ)
Modified: php/php-src/branches/PHP_5_3/win32/php5dllts.dsp
===================================================================
(Binary files differ)
Deleted: php/php-src/branches/PHP_5_3/win32/wfile.c
===================================================================
--- php/php-src/branches/PHP_5_3/win32/wfile.c 2010-09-11 18:22:17 UTC (rev
303279)
+++ php/php-src/branches/PHP_5_3/win32/wfile.c 2010-09-11 19:07:43 UTC (rev
303280)
@@ -1,17 +0,0 @@
-
-/* Function borrowed from the Downhill Project */
-#include "wfile.h"
-#include "direct.h"
-
-int readlink(char *file_Name, char *buf_Mem, int buf_Size)
-{
- /* See if the file exists */
- if (access(file_Name, WFILE_EXISTS) == -1) {
- errno = ENOENT;
- } else {
- errno = EINVAL;
- }
-
- /* Either way, it's not a link */
- return -1;
-}
Deleted: php/php-src/branches/PHP_5_3/win32/wfile.h
===================================================================
--- php/php-src/branches/PHP_5_3/win32/wfile.h 2010-09-11 18:22:17 UTC (rev
303279)
+++ php/php-src/branches/PHP_5_3/win32/wfile.h 2010-09-11 19:07:43 UTC (rev
303280)
@@ -1,16 +0,0 @@
-#include <io.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#define access _access
-#define WFILE_EXISTS 0
-#ifndef ENOENT
-#define ENOENT 136
-#endif
-#ifndef EINVAL
-#define EINVAL 131
-#endif
-
-int readlink(char *, char *, int);
-int checkroot(char *path);
Modified: php/php-src/trunk/win32/build/config.w32
===================================================================
--- php/php-src/trunk/win32/build/config.w32 2010-09-11 18:22:17 UTC (rev
303279)
+++ php/php-src/trunk/win32/build/config.w32 2010-09-11 19:07:43 UTC (rev
303280)
@@ -354,7 +354,7 @@
userspace.c transports.c xp_socket.c mmap.c glob_wrapper.c");
ADD_SOURCES("win32", "glob.c readdir.c \
- registry.c select.c sendmail.c time.c wfile.c winutil.c wsyslog.c
globals.c");
+ registry.c select.c sendmail.c time.c winutil.c wsyslog.c globals.c");
STDOUT.WriteBlankLines(1);
Modified: php/php-src/trunk/win32/php5dll.dsp
===================================================================
(Binary files differ)
Modified: php/php-src/trunk/win32/php5dllts.dsp
===================================================================
(Binary files differ)
Deleted: php/php-src/trunk/win32/wfile.c
===================================================================
--- php/php-src/trunk/win32/wfile.c 2010-09-11 18:22:17 UTC (rev 303279)
+++ php/php-src/trunk/win32/wfile.c 2010-09-11 19:07:43 UTC (rev 303280)
@@ -1,17 +0,0 @@
-
-/* Function borrowed from the Downhill Project */
-#include "wfile.h"
-#include "direct.h"
-
-int readlink(char *file_Name, char *buf_Mem, int buf_Size)
-{
- /* See if the file exists */
- if (access(file_Name, WFILE_EXISTS) == -1) {
- errno = ENOENT;
- } else {
- errno = EINVAL;
- }
-
- /* Either way, it's not a link */
- return -1;
-}
Deleted: php/php-src/trunk/win32/wfile.h
===================================================================
--- php/php-src/trunk/win32/wfile.h 2010-09-11 18:22:17 UTC (rev 303279)
+++ php/php-src/trunk/win32/wfile.h 2010-09-11 19:07:43 UTC (rev 303280)
@@ -1,16 +0,0 @@
-#include <io.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#define access _access
-#define WFILE_EXISTS 0
-#ifndef ENOENT
-#define ENOENT 136
-#endif
-#ifndef EINVAL
-#define EINVAL 131
-#endif
-
-int readlink(char *, char *, int);
-int checkroot(char *path);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
