- Remove #ifdefs around ftok function so that it is also available when

  none of the IPC extensions are enabled.

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 626bf636d02d4796e21a53237c2b9b7ca743e038..ccc0b0a833cd0486b5c026b4635e704654f6913d 100644 (file)
--- 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 67a257a87a1fdfcfa0b4e02e79c3f61a39004438..7f4adf450d7d3143aff40f6adf3ae6ba4b40719f 100644 (file)
--- 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 c3d44c72333e43765d46ed520acba1108b091768..6f8029cde79f7b0da2e1b0357fcbc5afa2a47658 100644 (file)
--- 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 */