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

  none of the IPC extensions are enabled.

Author: Derick Rethans

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)
 

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

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 */