diff options
| author | Derick Rethans <derick@php.net> | 2002-10-20 10:18:20 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2002-10-20 10:18:20 +0000 |
| commit | c5a73b31f6874d15f8a3ecb852a6dde989b9eb8e (patch) | |
| tree | 57a03f8e6ed7496f5282ca336ce23168ef581857 | |
| parent | 12642146c0acde424bc2025667ad60270cc8b748 (diff) | |
| download | php-git-c5a73b31f6874d15f8a3ecb852a6dde989b9eb8e.tar.gz | |
- Remove #ifdefs around ftok function so that it is also available when
none of the IPC extensions are enabled.
| -rw-r--r-- | ext/standard/basic_functions.c | 2 | ||||
| -rw-r--r-- | ext/standard/ftok.c | 4 | ||||
| -rw-r--r-- | ext/standard/php_ftok.h | 4 |
3 files changed, 0 insertions, 10 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 626bf636d0..ccc0b0a833 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -832,9 +832,7 @@ function_entry basic_functions[] = { PHP_FE(version_compare, NULL) /* functions from ftok.c*/ -#if HAVE_SYSVSEM || HAVE_SYSVSHM || HAVE_SHMOP PHP_FE(ftok, NULL) -#endif PHP_FE(str_rot13, NULL) diff --git a/ext/standard/ftok.c b/ext/standard/ftok.c index 67a257a87a..7f4adf450d 100644 --- a/ext/standard/ftok.c +++ b/ext/standard/ftok.c @@ -20,8 +20,6 @@ #include "php.h" -#if HAVE_SYSVSEM || HAVE_SYSVSHM || HAVE_SHMOP - #include <sys/types.h> #include <sys/ipc.h> @@ -56,8 +54,6 @@ PHP_FUNCTION(ftok) } /* }}} */ -#endif - /* * Local variables: * tab-width: 4 diff --git a/ext/standard/php_ftok.h b/ext/standard/php_ftok.h index c3d44c7233..6f8029cde7 100644 --- a/ext/standard/php_ftok.h +++ b/ext/standard/php_ftok.h @@ -21,10 +21,6 @@ #ifndef PHP_FTOK_H #define PHP_FTOK_H -#if HAVE_SYSVSEM || HAVE_SYSVSHM || HAVE_SHMOP - PHP_FUNCTION(ftok); -#endif - #endif /* PHP_FTOK_H */ |