CVS update: php31/main

Date: Tuesday September 15, 1998 @ 9:02 Author: ssb Update of /repository/php31/main In directory asf:/u2/tmp/cvs-serv3568/main Modified Files: .cvsignore Makefile.am internal_functions.c list.c Added Files: mkexthdrs mkextinfo Log Message: Fixed library dependencies in ext/. Removed the hardcoded extension pointers in main/internal_functions.c. Introduced a new file that has to be present in all extensions: extinfo.c.stub Some other fixes. Index: php31/main/.cvsignore diff -c php31/main/.cvsignore:2.1 php31/main/.cvsignore:2.2 *** php31/main/.cvsignore:2.1 Fri Jul 3 12:24:54 1998 --- php31/main/.cvsignore Tue Sep 15 09:02:13 1998 *************** *** 4,6 **** --- 4,8 ---- *-scanner.c *-parser.output *-parser.[ch] + extinfo.c + exthdrs.h Index: php31/main/Makefile.am diff -c php31/main/Makefile.am:2.9 php31/main/Makefile.am:2.10 *** php31/main/Makefile.am:2.9 Sat Sep 12 10:47:41 1998 --- php31/main/Makefile.am Tue Sep 15 09:02:13 1998 *************** *** 28,33 **** --- 28,35 ---- # Authors: Stig Bakken <ssb@guardian.no> # + EXTENSIONS=@EXT_SUBDIRS@ + INCLUDES=@INCLUDES@ -I$(top_srcdir) CLEANFILES=\ ini-scanner.c ini-parser.[ch] \ *************** *** 60,62 **** --- 62,82 ---- language-scanner.c: $(srcdir)/language-scanner.l language-parser.h flex -Pphp -o$@ -i $(srcdir)/language-scanner.l + + internal_functions.c: extinfo.c exthdrs.h + + extinfo.c: Makefile mkextinfo @EXTINFO_DEPS@ + ./mkextinfo $(EXTENSIONS) > $@.temp + @if ! cmp $@ $@.tmp >/dev/null 2>&1; then \ + mv $@.temp $@ ; \ + else \ + echo "$@ unchanged" ; \ + fi + + exthdrs.h: Makefile mkexthdrs + ./mkexthdrs $(EXTENSIONS) > $@.temp + @if ! cmp $@ $@.tmp >/dev/null 2>&1; then \ + mv $@.temp $@ ; \ + else \ + echo "$@ unchanged" ; \ + fi Index: php31/main/internal_functions.c diff -c php31/main/internal_functions.c:2.8 php31/main/internal_functions.c:2.9 *** php31/main/internal_functions.c:2.8 Thu Sep 10 20:22:51 1998 --- php31/main/internal_functions.c Tue Sep 15 09:02:14 1998 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 2.8 1998/09/11 00:22:51 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 2.9 1998/09/15 13:02:14 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 43,90 **** #include <stdlib.h> #include <stdio.h> - #include "ext/ldap/php3_ldap.h" - #include "ext/mysql/php3_mysql.h" - #include "ext/standard/php3_bcmath.h" - #include "ext/msql/php3_msql.h" - #include "ext/standard/basic_functions.h" - #include "ext/standard/phpmath.h" - #include "ext/standard/php3_string.h" - #include "ext/oracle/oracle.h" - #include "ext/standard/base64.h" - #include "ext/standard/php3_dir.h" - #include "ext/standard/dns.h" - #include "ext/postgres/php3_pgsql.h" - #include "ext/velocis/php3_velocis.h" - #include "ext/sybase/php3_sybase.h" - #include "ext/sybase-ct/php3_sybase-ct.h" - #include "ext/standard/reg.h" - #include "ext/standard/mail.h" - #include "ext/standard/md5.h" - #include "ext/gd/php3_gd.h" - #include "ext/standard/html.h" #include "dl.h" #include "head.h" #include "post.h" - #include "ext/standard/exec.h" - #include "ext/solid/php3_solid.h" - #include "ext/sybase/sybsql.h" - #include "ext/adabasd/adabasd.h" - #include "ext/standard/file.h" - #include "ext/dbase/dbase.h" - #include "ext/filepro/filepro.h" - #include "ext/db/db.h" - #include "ext/standard/php3_syslog.h" - #include "ext/standard/php3_filestat.h" - #include "ext/standard/php3_browscap.h" - #include "ext/standard/pack.h" #include "php3_debugger.h" - #include "ext/odbc/php3_unified_odbc.h" - #include "ext/snmp/php3_snmp.h" - #include "ext/zlib/php3_zlib.h" - #include "ext/com/php3_COM.h" #include "os/nt/registry.h" #ifndef THREAD_SAFE HashTable list_destructors,module_registry; static int module_count; --- 43,95 ---- #include <stdlib.h> #include <stdio.h> #include "dl.h" #include "head.h" #include "post.h" #include "php3_debugger.h" #include "os/nt/registry.h" + #if 0 + # include "ext/ldap/php3_ldap.h" + # include "ext/mysql/php3_mysql.h" + # include "ext/standard/php3_bcmath.h" + # include "ext/msql/php3_msql.h" + # include "ext/standard/basic_functions.h" + # include "ext/standard/phpmath.h" + # include "ext/standard/php3_string.h" + # include "ext/oracle/oracle.h" + # include "ext/standard/base64.h" + # include "ext/standard/php3_dir.h" + # include "ext/standard/dns.h" + # include "ext/postgres/php3_pgsql.h" + # include "ext/velocis/php3_velocis.h" + # include "ext/sybase/php3_sybase.h" + # include "ext/sybase-ct/php3_sybase-ct.h" + # include "ext/standard/reg.h" + # include "ext/standard/mail.h" + # include "ext/standard/md5.h" + # include "ext/gd/php3_gd.h" + # include "ext/standard/html.h" + # include "ext/standard/exec.h" + # include "ext/solid/php3_solid.h" + # include "ext/sybase/sybsql.h" + # include "ext/adabasd/adabasd.h" + # include "ext/standard/file.h" + # include "ext/dbase/dbase.h" + # include "ext/filepro/filepro.h" + # include "ext/db/db.h" + # include "ext/standard/php3_syslog.h" + # include "ext/standard/php3_filestat.h" + # include "ext/standard/php3_browscap.h" + # include "ext/standard/pack.h" + # include "ext/odbc/php3_unified_odbc.h" + # include "ext/snmp/php3_snmp.h" + # include "ext/zlib/php3_zlib.h" + # include "ext/com/php3_COM.h" + #else + # include "exthdrs.h" + #endif + #ifndef THREAD_SAFE HashTable list_destructors,module_registry; static int module_count; *************** *** 102,107 **** --- 107,113 ---- unsigned char second_arg_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE }; unsigned char second_arg_allow_ref[] = { 2, BYREF_NONE, BYREF_ALLOW }; + #if 0 php3_builtin_module php3_builtin_modules[] = { {"Basic functions", basic_functions_module_ptr}, *************** *** 140,146 **** {"Win32 COM", COM_module_ptr}, {NULL, NULL} }; ! /* this function doesn't check for too many parameters */ PHPAPI int getParameters(HashTable *ht, int param_count,...) --- 146,154 ---- {"Win32 COM", COM_module_ptr}, {NULL, NULL} }; ! #else ! # include "extinfo.c" ! #endif /* this function doesn't check for too many parameters */ PHPAPI int getParameters(HashTable *ht, int param_count,...) Index: php31/main/list.c diff -c php31/main/list.c:2.2 php31/main/list.c:2.3 *** php31/main/list.c:2.2 Thu Aug 27 16:55:44 1998 --- php31/main/list.c Tue Sep 15 09:02:14 1998 *************** *** 29,35 **** */ ! /* $Id: list.c,v 2.2 1998/08/27 20:55:44 shane Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: list.c,v 2.3 1998/09/15 13:02:14 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 38,44 **** #include "php3_list.h" #include "modules.h" ! #include "ext/db/db.h" #if HAVE_DIRENT_H #include <dirent.h> --- 38,44 ---- #include "php3_list.h" #include "modules.h" ! #include "ext/db/php3_db.h" #if HAVE_DIRENT_H #include <dirent.h> -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net