derick Sun Oct 20 09:35:56 2002 EDT
Modified files:
/php4/ext/standard basic_functions.c ftok.c php_ftok.h
Log:
- Only include ftok() if it is available
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.531
php4/ext/standard/basic_functions.c:1.532
--- php4/ext/standard/basic_functions.c:1.531 Sun Oct 20 06:18:19 2002
+++ php4/ext/standard/basic_functions.c Sun Oct 20 09:35:56 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.531 2002/10/20 10:18:19 derick Exp $ */
+/* $Id: basic_functions.c,v 1.532 2002/10/20 13:35:56 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -832,7 +832,9 @@
PHP_FE(version_compare,
NULL)
/* functions from ftok.c*/
+#if HAVE_FTOK
PHP_FE(ftok, NULL)
+#endif
PHP_FE(str_rot13, NULL)
Index: php4/ext/standard/ftok.c
diff -u php4/ext/standard/ftok.c:1.7 php4/ext/standard/ftok.c:1.8
--- php4/ext/standard/ftok.c:1.7 Sun Oct 20 06:18:20 2002
+++ php4/ext/standard/ftok.c Sun Oct 20 09:35:56 2002
@@ -16,13 +16,14 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ftok.c,v 1.7 2002/10/20 10:18:20 derick Exp $ */
+/* $Id: ftok.c,v 1.8 2002/10/20 13:35:56 derick Exp $ */
#include "php.h"
#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 @@
RETURN_LONG(k);
}
/* }}} */
+#endif
/*
* Local variables:
Index: php4/ext/standard/php_ftok.h
diff -u php4/ext/standard/php_ftok.h:1.4 php4/ext/standard/php_ftok.h:1.5
--- php4/ext/standard/php_ftok.h:1.4 Sun Oct 20 06:18:20 2002
+++ php4/ext/standard/php_ftok.h Sun Oct 20 09:35:56 2002
@@ -16,11 +16,13 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ftok.h,v 1.4 2002/10/20 10:18:20 derick Exp $ */
+/* $Id: php_ftok.h,v 1.5 2002/10/20 13:35:56 derick Exp $ */
#ifndef PHP_FTOK_H
#define PHP_FTOK_H
+#if HAVE_FTOK
PHP_FUNCTION(ftok);
+#endif
#endif /* PHP_FTOK_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
