- Only include ftok() if it is available

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index ccc0b0a833cd0486b5c026b4635e704654f6913d..c8d5aa505a5d172a7e67d8d7824a0d39d24d4431 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -832,7 +832,9 @@ function_entry basic_functions[] = {
     PHP_FE(version_compare,                                                                                                    NULL)
 
        /* functions from ftok.c*/
+#if HAVE_FTOK
        PHP_FE(ftok,    NULL)
+#endif
 
        PHP_FE(str_rot13, NULL)
 

diff --git a/ext/standard/ftok.c b/ext/standard/ftok.c
index 7f4adf450d7d3143aff40f6adf3ae6ba4b40719f..adb374e060f37e6b8f2172206b5666eef7b23714 100644 (file)
--- a/ext/standard/ftok.c
+++ b/ext/standard/ftok.c
@@ -23,6 +23,7 @@
 #include <sys/types.h>                                                                                                        
 #include <sys/ipc.h>
 
+#if HAVE_FTOK
 /* {{{ proto int ftok(string pathname, string proj)
    Convert a pathname and a project identifier to a System V IPC key */
 PHP_FUNCTION(ftok)
@@ -53,6 +54,7 @@ PHP_FUNCTION(ftok)
     RETURN_LONG(k);
 }
 /* }}} */
+#endif
 
 /*
  * Local variables:

diff --git a/ext/standard/php_ftok.h b/ext/standard/php_ftok.h
index 6f8029cde79f7b0da2e1b0357fcbc5afa2a47658..978520a30aacb7b8c6be1d791344b728ff0f7b45 100644 (file)
--- a/ext/standard/php_ftok.h
+++ b/ext/standard/php_ftok.h
@@ -21,6 +21,8 @@
 #ifndef PHP_FTOK_H
 #define PHP_FTOK_H
 
+#if HAVE_FTOK
 PHP_FUNCTION(ftok);
+#endif
 
 #endif /* PHP_FTOK_H */