[PHP4BETA] CVS update: php4/ext/standard

Date: Friday May 14, 1999 @ 14:25 Author: zeev Update of /repository/php4/ext/standard In directory php:/tmp/cvs-serv9356/ext/standard Modified Files: basic_functions.c dl.h file.h fsock.h head.h pack.h php3_browscap.h php3_crypt.h php3_dir.h php3_filestat.h php3_mail.h php3_syslog.h Log Message: * Include all of the standard modules in internal_functions.c.in. Stig - is that the way you intended it to be? How does the basic_functions module get in there? * Fix to get MySQL objects working, even though I'll probably make a dedicated MySQL object in the future. Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.20 php4/ext/standard/basic_functions.c:1.21 --- php4/ext/standard/basic_functions.c:1.20 Wed May 12 13:29:51 1999 +++ php4/ext/standard/basic_functions.c Fri May 14 14:25:16 1999 @@ -122,7 +122,6 @@ {"rtrim", php3_chop, NULL}, {"pos", array_current, first_arg_force_ref}, - {"fsockopen", php3_fsockopen, third_and_fourth_args_force_ref}, {"getimagesize", php3_getimagesize, NULL}, {"htmlspecialchars", php3_htmlspecialchars, NULL}, {"htmlentities", php3_htmlentities, NULL}, Index: php4/ext/standard/dl.h diff -u php4/ext/standard/dl.h:1.2 php4/ext/standard/dl.h:1.3 --- php4/ext/standard/dl.h:1.2 Sun May 9 04:48:01 1999 +++ php4/ext/standard/dl.h Fri May 14 14:25:16 1999 @@ -30,7 +30,7 @@ */ -/* $Id: dl.h,v 1.2 1999/05/09 08:48:01 zeev Exp $ */ +/* $Id: dl.h,v 1.3 1999/05/14 18:25:16 zeev Exp $ */ #ifndef _DL_H #define _DL_H @@ -56,5 +56,6 @@ #endif +#define phpext_dl_ptr dl_module_ptr #endif /* _DL_H */ Index: php4/ext/standard/file.h diff -u php4/ext/standard/file.h:1.3 php4/ext/standard/file.h:1.4 --- php4/ext/standard/file.h:1.3 Tue Apr 27 09:06:58 1999 +++ php4/ext/standard/file.h Fri May 14 14:25:16 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.h,v 1.3 1999/04/27 13:06:58 rasmus Exp $ */ +/* $Id: file.h,v 1.4 1999/05/14 18:25:16 zeev Exp $ */ #ifndef _FILE_H #define _FILE_H @@ -64,4 +64,5 @@ extern void php3_get_meta_tags(INTERNAL_FUNCTION_PARAMETERS); extern PHP_FUNCTION(flock); +#define phpext_file_ptr php3_file_module_ptr #endif /* _FILE_H */ Index: php4/ext/standard/fsock.h diff -u php4/ext/standard/fsock.h:1.2 php4/ext/standard/fsock.h:1.3 --- php4/ext/standard/fsock.h:1.2 Sun Apr 18 11:58:26 1999 +++ php4/ext/standard/fsock.h Fri May 14 14:25:16 1999 @@ -27,7 +27,7 @@ | Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: fsock.h,v 1.2 1999/04/18 15:58:26 zeev Exp $ */ +/* $Id: fsock.h,v 1.3 1999/05/14 18:25:16 zeev Exp $ */ #ifndef _FSOCK_H #define _FSOCK_H @@ -53,5 +53,7 @@ extern int _php3_sock_fgets(char *buf, int maxlen, int socket); extern int _php3_sock_fread(char *buf, int maxlen, int socket); extern int _php3_is_persistent_sock(int); + +#define phpext_fsock_ptr fsock_module_ptr #endif /* _FSOCK_H */ Index: php4/ext/standard/head.h diff -u php4/ext/standard/head.h:1.4 php4/ext/standard/head.h:1.5 --- php4/ext/standard/head.h:1.4 Tue May 11 16:38:16 1999 +++ php4/ext/standard/head.h Fri May 14 14:25:16 1999 @@ -61,4 +61,6 @@ PHPAPI int php3_header(void); int php3_headers_unsent(void); +#define phpext_head_ptr php3_header_module_ptr + #endif Index: php4/ext/standard/pack.h diff -u php4/ext/standard/pack.h:1.1 php4/ext/standard/pack.h:1.2 --- php4/ext/standard/pack.h:1.1 Fri Apr 16 20:37:07 1999 +++ php4/ext/standard/pack.h Fri May 14 14:25:16 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pack.h,v 1.1 1999/04/17 00:37:07 ssb Exp $ */ +/* $Id: pack.h,v 1.2 1999/05/14 18:25:16 zeev Exp $ */ #ifndef _PACK_H #define _PACK_H @@ -38,5 +38,7 @@ extern int php3_minit_pack(INIT_FUNC_ARGS); extern void php3_pack(INTERNAL_FUNCTION_PARAMETERS); extern void php3_unpack(INTERNAL_FUNCTION_PARAMETERS); + +#define phpext_pack_ptr pack_module_ptr #endif /* _PACK_H */ Index: php4/ext/standard/php3_browscap.h diff -u php4/ext/standard/php3_browscap.h:1.1 php4/ext/standard/php3_browscap.h:1.2 --- php4/ext/standard/php3_browscap.h:1.1 Fri Apr 16 20:37:07 1999 +++ php4/ext/standard/php3_browscap.h Fri May 14 14:25:16 1999 @@ -40,4 +40,6 @@ extern void php3_get_browser(INTERNAL_FUNCTION_PARAMETERS); +#define phpext_browscap_ptr browscap_module_ptr + #endif /* _PHP3_BROWSCAP_H */ Index: php4/ext/standard/php3_crypt.h diff -u php4/ext/standard/php3_crypt.h:1.1 php4/ext/standard/php3_crypt.h:1.2 --- php4/ext/standard/php3_crypt.h:1.1 Wed Apr 21 20:25:57 1999 +++ php4/ext/standard/php3_crypt.h Fri May 14 14:25:16 1999 @@ -10,4 +10,6 @@ #define crypt_module_ptr NULL #endif +#define phpext_crypt_ptr crypt_module_ptr + #endif Index: php4/ext/standard/php3_dir.h diff -u php4/ext/standard/php3_dir.h:1.1 php4/ext/standard/php3_dir.h:1.2 --- php4/ext/standard/php3_dir.h:1.1 Fri Apr 16 20:37:07 1999 +++ php4/ext/standard/php3_dir.h Fri May 14 14:25:16 1999 @@ -29,7 +29,7 @@ */ -/* $Id: php3_dir.h,v 1.1 1999/04/17 00:37:07 ssb Exp $ */ +/* $Id: php3_dir.h,v 1.2 1999/05/14 18:25:16 zeev Exp $ */ #ifndef _PHP3_DIR_H #define _PHP3_DIR_H @@ -44,5 +44,7 @@ extern void php3_rewinddir(INTERNAL_FUNCTION_PARAMETERS); extern void php3_readdir(INTERNAL_FUNCTION_PARAMETERS); extern void php3_getdir(INTERNAL_FUNCTION_PARAMETERS); + +#define phpext_dir_ptr php3_dir_module_ptr #endif /* _PHP3_DIR_H */ Index: php4/ext/standard/php3_filestat.h diff -u php4/ext/standard/php3_filestat.h:1.1 php4/ext/standard/php3_filestat.h:1.2 --- php4/ext/standard/php3_filestat.h:1.1 Fri Apr 16 20:37:07 1999 +++ php4/ext/standard/php3_filestat.h Fri May 14 14:25:16 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php3_filestat.h,v 1.1 1999/04/17 00:37:07 ssb Exp $ */ +/* $Id: php3_filestat.h,v 1.2 1999/05/14 18:25:16 zeev Exp $ */ #ifndef _FILESTAT_H #define _FILESTAT_H @@ -60,5 +60,7 @@ extern php3_module_entry php3_filestat_module_entry; #define php3_filestat_module_ptr &php3_filestat_module_entry + +#define phpext_filestat_ptr php3_filestat_module_ptr #endif /* _FILESTAT_H */ Index: php4/ext/standard/php3_mail.h diff -u php4/ext/standard/php3_mail.h:1.2 php4/ext/standard/php3_mail.h:1.3 --- php4/ext/standard/php3_mail.h:1.2 Sun May 9 04:48:01 1999 +++ php4/ext/standard/php3_mail.h Fri May 14 14:25:16 1999 @@ -28,7 +28,7 @@ */ -/* $Id: php3_mail.h,v 1.2 1999/05/09 08:48:01 zeev Exp $ */ +/* $Id: php3_mail.h,v 1.3 1999/05/14 18:25:16 zeev Exp $ */ #ifndef _MAIL_H #define _MAIL_H @@ -43,4 +43,7 @@ #else #define mail_module_ptr NULL #endif + +#define phpext_mail_ptr mail_module_ptr + #endif /* _MAIL_H */ Index: php4/ext/standard/php3_syslog.h diff -u php4/ext/standard/php3_syslog.h:1.1 php4/ext/standard/php3_syslog.h:1.2 --- php4/ext/standard/php3_syslog.h:1.1 Fri Apr 16 20:37:07 1999 +++ php4/ext/standard/php3_syslog.h Fri May 14 14:25:16 1999 @@ -27,6 +27,10 @@ | | +----------------------------------------------------------------------+ */ + +#ifndef _PHP_SYSLOG_H +#define _PHP_SYSLOG_H + #if HAVE_SYSLOG_H extern php3_module_entry syslog_module_entry; #define syslog_module_ptr &syslog_module_entry @@ -42,3 +46,7 @@ #else #define syslog_module_ptr NULL #endif + +#define phpext_syslog_ptr syslog_module_ptr + +#endif /* _PHP_SYSLOG_H */ -- PHP 4 Beta