Re: cvs: php4 /ext/standard basic_functions.c ftok.c php_ftok.h

Hey Derick, It might be a good idea to check for ftok in configure and protect it with HAVE_FTOK, just in case. --Wez. On 10/20/02, "Derick Rethans" <d.rethans@jdimedia.nl> wrote: > derick Sun Oct 20 06:18:20 2002 EDT > > Modified files: > /php4/ext/standard basic_functions.c ftok.c php_ftok.h > Log: > - Remove #ifdefs around ftok function so that it is also available when > none of the IPC extensions are enabled. > > > Index: php4/ext/standard/basic_functions.c > diff -u php4/ext/standard/basic_functions.c:1.530 php4/ext/standard/basic_functions.c:1.531 > --- php4/ext/standard/basic_functions.c:1.530 Thu Oct 17 18:44:43 2002 > +++ php4/ext/standard/basic_functions.c Sun Oct 20 06:18:19 2002 > @@ -17,7 +17,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: basic_functions.c,v 1.530 2002/10/17 22:44:43 iliaa Exp $ */ > +/* $Id: basic_functions.c,v 1.531 2002/10/20 10:18:19 derick Exp $ */ > > #include "php.h" > #include "php_streams.h" > @@ -832,9 +832,7 @@ > 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) > > Index: php4/ext/standard/ftok.c > diff -u php4/ext/standard/ftok.c:1.6 php4/ext/standard/ftok.c:1.7 > --- php4/ext/standard/ftok.c:1.6 Fri Aug 23 21:19:28 2002 > +++ php4/ext/standard/ftok.c Sun Oct 20 06:18:20 2002 > @@ -16,12 +16,10 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: ftok.c,v 1.6 2002/08/24 01:19:28 helly Exp $ */ > +/* $Id: ftok.c,v 1.7 2002/10/20 10:18:20 derick Exp $ */ > > #include "php.h" > > -#if HAVE_SYSVSEM || HAVE_SYSVSHM || HAVE_SHMOP > - > #include <sys/types.h> > > #include <sys/ipc.h> > > @@ -55,8 +53,6 @@ > RETURN_LONG(k); > } > /* }}} */ > - > -#endif > > /* > * Local variables: > Index: php4/ext/standard/php_ftok.h > diff -u php4/ext/standard/php_ftok.h:1.3 php4/ext/standard/php_ftok.h:1.4 > --- php4/ext/standard/php_ftok.h:1.3 Thu Feb 28 03:26:46 2002 > +++ php4/ext/standard/php_ftok.h Sun Oct 20 06:18:20 2002 > @@ -16,15 +16,11 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: php_ftok.h,v 1.3 2002/02/28 08:26:46 sebastian Exp $ */ > +/* $Id: php_ftok.h,v 1.4 2002/10/20 10:18:20 derick Exp $ */ > > #ifndef PHP_FTOK_H > #define PHP_FTOK_H > > -#if HAVE_SYSVSEM || HAVE_SYSVSHM || HAVE_SHMOP > - > 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