diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2002-11-06 18:07:23 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2002-11-06 18:07:23 +0000 |
| commit | 78e2e69b23a6811f148f68fcabe41dedc9e29005 (patch) | |
| tree | bc116c046cc48cf100fbb467826bde9064a31b19 /TSRM | |
| parent | 3037b35b31a55d4a693a7ace1aa7138bccb524a3 (diff) | |
| download | php-git-78e2e69b23a6811f148f68fcabe41dedc9e29005.tar.gz | |
Instead of checking whether realpath exists based on OS. Use the
HAVE_REALPATH define, which is set if realpath() is avaliable. This patch
also resolves bug #18868.
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 2 | ||||
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index 86cc3fc724..12c35e1ced 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -41,7 +41,7 @@ #include "tsrm_nw.h" #endif -#ifdef __BEOS__ +#ifndef HAVE_REALPATH #define realpath(x,y) strcpy(y,x) #endif diff --git a/TSRM/tsrm_virtual_cwd.h b/TSRM/tsrm_virtual_cwd.h index 18452304fd..2465d81b6d 100644 --- a/TSRM/tsrm_virtual_cwd.h +++ b/TSRM/tsrm_virtual_cwd.h @@ -233,7 +233,7 @@ typedef struct _virtual_cwd_globals { #define VCWD_POPEN(command, type) popen(command, type) #define VCWD_ACCESS(pathname, mode) access(pathname, mode) -#if !defined(TSRM_WIN32) && !defined(NETWARE) +#ifdef HAVE_REALPATH #define VCWD_REALPATH(path, real_path) realpath(path, real_path) #else #define VCWD_REALPATH(path, real_path) strcpy(real_path, path) |