From: Derick Rethans <derick@php.net>
Date: Sun, 20 Oct 2002 10:18:20 +0000 (+0000)
Subject: - Remove #ifdefs around ftok function so that it is also available when
X-Git-Tag: php-4.3.0pre2~265
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5a73b31f6874d15f8a3ecb852a6dde989b9eb8e;p=php

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