cvs: /php4 acconfig.h.in config.w32.h configure.in fopen-wrappers.c /php4/ext/cpdf php_cpdf.h /php4/ext/cybercash cyberlib.php /php4/ext/dav dav.c
/php4/ext/db db.c /php4/ext/domxml php_domxml.h /php4/ext/gd gd.c gdttf.h /php4/ext/informix config.m4 php_informix.h /php4/ext/interbase
php_interbase.h /php4/ext/ldap ldap.c /php4/ext/msql php_msql.c /php4/ext/mysql php_mysql.c /php4/ext/posix posix.c /php4/ext/session session.c
/php4/ext/standard config.m4 crypt.c head.h info.c md5.c md5.h microtime.c /php4/ext/sybase_ct php_sybase_ct.h /php4/ext/sysvshm sysvshm.c

zeev Fri Feb 25 19:20:56 2000 EDT Modified files: /php4 acconfig.h.in config.w32.h configure.in fopen-wrappers.c /php4/ext/cpdf php_cpdf.h /php4/ext/cybercash cyberlib.php /php4/ext/dav dav.c /php4/ext/db db.c /php4/ext/domxml php_domxml.h /php4/ext/gd gd.c gdttf.h /php4/ext/informix config.m4 php_informix.h /php4/ext/interbase php_interbase.h /php4/ext/ldap ldap.c /php4/ext/msql php_msql.c /php4/ext/mysql php_mysql.c /php4/ext/posix posix.c /php4/ext/session session.c /php4/ext/standard config.m4 crypt.c head.h info.c md5.c md5.h microtime.c /php4/ext/sybase_ct php_sybase_ct.h /php4/ext/sysvshm sysvshm.c Log: - Convert 'PHP3' to 'PHP' - Avoid declaring crypt() related salt types twice Index: php4/acconfig.h.in diff -u php4/acconfig.h.in:1.34 php4/acconfig.h.in:1.35 --- php4/acconfig.h.in:1.34 Thu Feb 10 11:41:18 2000 +++ php4/acconfig.h.in Fri Feb 25 19:20:47 2000 @@ -105,7 +105,7 @@ /* Define if you want include() and other functions to be able to open * http and ftp URLs as files. */ -#define PHP3_URL_FOPEN 0 +#define PHP_URL_FOPEN 0 /* Define if you have broken header files like SunOS 4 */ #define MISSING_FCLOSE_DECL 0 Index: php4/config.w32.h diff -u php4/config.w32.h:1.21 php4/config.w32.h:1.22 --- php4/config.w32.h:1.21 Wed Feb 23 13:10:17 2000 +++ php4/config.w32.h Fri Feb 25 19:20:47 2000 @@ -23,7 +23,7 @@ #define HAVE_WDDX 1 /* should be added to runtime config*/ -#define PHP3_URL_FOPEN 1 +#define PHP_URL_FOPEN 1 #define STDIN_FILENO 0 #define STDOUT_FILENO 1 Index: php4/configure.in diff -u php4/configure.in:1.94 php4/configure.in:1.95 --- php4/configure.in:1.94 Fri Feb 25 13:27:02 2000 +++ php4/configure.in Fri Feb 25 19:20:47 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.94 2000/02/25 21:27:02 ssb Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.95 2000/02/26 03:20:47 zeev Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -532,14 +532,14 @@ accessing files via http or ftp.], [ if test "$enableval" = "yes"; then - AC_DEFINE(PHP3_URL_FOPEN, 1) + AC_DEFINE(PHP_URL_FOPEN, 1) AC_MSG_RESULT(yes) else - AC_DEFINE(PHP3_URL_FOPEN, 0) + AC_DEFINE(PHP_URL_FOPEN, 0) AC_MSG_RESULT(no) fi ],[ - AC_DEFINE(PHP3_URL_FOPEN, 1) + AC_DEFINE(PHP_URL_FOPEN, 1) AC_MSG_RESULT(yes) ]) Index: php4/fopen-wrappers.c diff -u php4/fopen-wrappers.c:1.42 php4/fopen-wrappers.c:1.43 --- php4/fopen-wrappers.c:1.42 Sat Feb 19 15:21:25 2000 +++ php4/fopen-wrappers.c Fri Feb 25 19:20:47 2000 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.42 2000/02/19 23:21:25 zeev Exp $ */ +/* $Id: fopen-wrappers.c,v 1.43 2000/02/26 03:20:47 zeev Exp $ */ #include "php.h" #include "php_globals.h" @@ -190,7 +190,7 @@ /* FIXME Lets not get in the habit of doing stuff like this. This should be runtime enabled, NOT compile time. */ -#if PHP3_URL_FOPEN +#if PHP_URL_FOPEN if (!(options & IGNORE_URL)) { return php_fopen_url_wrapper(path, mode, options, issock, socketd, opened_path); } Index: php4/ext/cpdf/php_cpdf.h diff -u php4/ext/cpdf/php_cpdf.h:1.4 php4/ext/cpdf/php_cpdf.h:1.5 --- php4/ext/cpdf/php_cpdf.h:1.4 Mon Jan 10 04:42:05 2000 +++ php4/ext/cpdf/php_cpdf.h Fri Feb 25 19:20:48 2000 @@ -26,7 +26,7 @@ | Authors: Uwe Steinmann | +----------------------------------------------------------------------+ */ -/* $Id: php_cpdf.h,v 1.4 2000/01/10 12:42:05 steinm Exp $ */ +/* $Id: php_cpdf.h,v 1.5 2000/02/26 03:20:48 zeev Exp $ */ #ifndef _PHP_CPDF_H #define _PHP_CPDF_H @@ -120,4 +120,4 @@ #define cpdf_module_ptr NULL #endif #define phpext_cpdf_ptr cpdf_module_ptr -#endif /* _PHP3_PDF_H */ +#endif /* _PHP_PDF_H */ Index: php4/ext/cybercash/cyberlib.php diff -u php4/ext/cybercash/cyberlib.php:1.3 php4/ext/cybercash/cyberlib.php:1.4 --- php4/ext/cybercash/cyberlib.php:1.3 Mon Dec 6 18:26:51 1999 +++ php4/ext/cybercash/cyberlib.php Fri Feb 25 19:20:48 2000 @@ -8,7 +8,7 @@ * compiled. * * * * * - * This is an attempt to duplicate the cybercash API for PHP3 * + * This is an attempt to duplicate the cybercash API for PHP * * users. * ********************************************************************* * This does not require merchant_conf for reasons that any file * Index: php4/ext/dav/dav.c diff -u php4/ext/dav/dav.c:1.12 php4/ext/dav/dav.c:1.13 --- php4/ext/dav/dav.c:1.12 Tue Feb 22 07:48:42 2000 +++ php4/ext/dav/dav.c Fri Feb 25 19:20:48 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dav.c,v 1.12 2000/02/22 15:48:42 eschmid Exp $ */ +/* $Id: dav.c,v 1.13 2000/02/26 03:20:48 zeev Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL @@ -105,19 +105,19 @@ { #if defined(THREAD_SAFE) phpdav_global_struct *phpdav_globals; - PHP3_MUTEX_ALLOC(phpdav_mutex); - PHP3_MUTEX_LOCK(phpdav_mutex); + PHP_MUTEX_ALLOC(phpdav_mutex); + PHP_MUTEX_LOCK(phpdav_mutex); numthreads++; if (numthreads==1){ if (!PHP3_TLS_PROC_STARTUP(PHPDAVTls)){ - PHP3_MUTEX_UNLOCK(phpdav_mutex); - PHP3_MUTEX_FREE(phpdav_mutex); + PHP_MUTEX_UNLOCK(phpdav_mutex); + PHP_MUTEX_FREE(phpdav_mutex); return FAILURE; } } - PHP3_MUTEX_UNLOCK(phdpav_mutex); + PHP_MUTEX_UNLOCK(phdpav_mutex); if(!PHP3_TLS_THREAD_INIT(PHPDAVTls,phpdav_globals,phpdav_global_struct)){ - PHP3_MUTEX_FREE(phpdav_mutex); + PHP_MUTEX_FREE(phpdav_mutex); return FAILURE; } #endif @@ -130,15 +130,15 @@ DAV_TLS_VARS; #ifdef THREAD_SAFE PHP3_TLS_THREAD_FREE(phpdav_globals); - PHP3_MUTEX_LOCK(phpdav_mutex); + PHP_MUTEX_LOCK(phpdav_mutex); numthreads--; if (numthreads < 1) { PHP3_TLS_PROC_SHUTDOWN(PHPDAVTls); - PHP3_MUTEX_UNLOCK(phpdav_mutex); - PHP3_MUTEX_FREE(phpdav_mutex); + PHP_MUTEX_UNLOCK(phpdav_mutex); + PHP_MUTEX_FREE(phpdav_mutex); return SUCCESS; } - PHP3_MUTEX_UNLOCK(phpdav_mutex); + PHP_MUTEX_UNLOCK(phpdav_mutex); #endif return SUCCESS; } Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.23 php4/ext/db/db.c:1.24 --- php4/ext/db/db.c:1.23 Sat Feb 19 15:21:26 2000 +++ php4/ext/db/db.c Fri Feb 25 19:20:49 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.23 2000/02/19 23:21:26 zeev Exp $ */ +/* $Id: db.c,v 1.24 2000/02/26 03:20:49 zeev Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL # include "dl/phpdl.h" @@ -1071,19 +1071,19 @@ { #if defined(THREAD_SAFE) dbm_global_struct *dbm_globals; - PHP3_MUTEX_ALLOC(dbm_mutex); - PHP3_MUTEX_LOCK(dbm_mutex); + PHP_MUTEX_ALLOC(dbm_mutex); + PHP_MUTEX_LOCK(dbm_mutex); numthreads++; if (numthreads==1){ if (!PHP3_TLS_PROC_STARTUP(DbmTls)){ - PHP3_MUTEX_UNLOCK(dbm_mutex); - PHP3_MUTEX_FREE(dbm_mutex); + PHP_MUTEX_UNLOCK(dbm_mutex); + PHP_MUTEX_FREE(dbm_mutex); return FAILURE; } } - PHP3_MUTEX_UNLOCK(dbm_mutex); + PHP_MUTEX_UNLOCK(dbm_mutex); if(!PHP3_TLS_THREAD_INIT(DbmTls,dbm_globals,dbm_global_struct)){ - PHP3_MUTEX_FREE(dbm_mutex); + PHP_MUTEX_FREE(dbm_mutex); return FAILURE; } #endif @@ -1096,15 +1096,15 @@ { #ifdef THREAD_SAFE PHP3_TLS_THREAD_FREE(dbm_globals); - PHP3_MUTEX_LOCK(dbm_mutex); + PHP_MUTEX_LOCK(dbm_mutex); numthreads--; if (numthreads<1) { PHP3_TLS_PROC_SHUTDOWN(DbmTls); - PHP3_MUTEX_UNLOCK(dbm_mutex); - PHP3_MUTEX_FREE(dbm_mutex); + PHP_MUTEX_UNLOCK(dbm_mutex); + PHP_MUTEX_FREE(dbm_mutex); return SUCCESS; } - PHP3_MUTEX_UNLOCK(dbm_mutex); + PHP_MUTEX_UNLOCK(dbm_mutex); #endif return SUCCESS; } Index: php4/ext/domxml/php_domxml.h diff -u php4/ext/domxml/php_domxml.h:1.9 php4/ext/domxml/php_domxml.h:1.10 --- php4/ext/domxml/php_domxml.h:1.9 Thu Feb 17 07:05:22 2000 +++ php4/ext/domxml/php_domxml.h Fri Feb 25 19:20:49 2000 @@ -29,7 +29,7 @@ */ -/* $Id: php_domxml.h,v 1.9 2000/02/17 15:05:22 steinm Exp $ */ +/* $Id: php_domxml.h,v 1.10 2000/02/26 03:20:49 zeev Exp $ */ #ifndef _PHP_DOMXML_H #define _PHP_DOMXML_H @@ -72,4 +72,4 @@ #endif /* HAVE_DOMXML */ #define phpext_domxml_ptr php_domxml_module_ptr -#endif /* _PHP3_DIR_H */ +#endif /* _PHP_DIR_H */ Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.38 php4/ext/gd/gd.c:1.39 --- php4/ext/gd/gd.c:1.38 Thu Feb 24 22:43:51 2000 +++ php4/ext/gd/gd.c Fri Feb 25 19:20:50 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.38 2000/02/25 06:43:51 jah Exp $ */ +/* $Id: gd.c,v 1.39 2000/02/26 03:20:50 zeev Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -181,19 +181,19 @@ { #if defined(THREAD_SAFE) gdlib_global_struct *gdlib_globals; - PHP3_MUTEX_ALLOC(gdlib_mutex); - PHP3_MUTEX_LOCK(gdlib_mutex); + PHP_MUTEX_ALLOC(gdlib_mutex); + PHP_MUTEX_LOCK(gdlib_mutex); numthreads++; if (numthreads==1){ if (!PHP3_TLS_PROC_STARTUP(GDlibTls)){ - PHP3_MUTEX_UNLOCK(gdlib_mutex); - PHP3_MUTEX_FREE(gdlib_mutex); + PHP_MUTEX_UNLOCK(gdlib_mutex); + PHP_MUTEX_FREE(gdlib_mutex); return FAILURE; } } - PHP3_MUTEX_UNLOCK(gdlib_mutex); + PHP_MUTEX_UNLOCK(gdlib_mutex); if(!PHP3_TLS_THREAD_INIT(GDlibTls,gdlib_globals,gdlib_global_struct)){ - PHP3_MUTEX_FREE(gdlib_mutex); + PHP_MUTEX_FREE(gdlib_mutex); return FAILURE; } #endif @@ -246,15 +246,15 @@ GD_TLS_VARS; #ifdef THREAD_SAFE PHP3_TLS_THREAD_FREE(gdlib_globals); - PHP3_MUTEX_LOCK(gdlib_mutex); + PHP_MUTEX_LOCK(gdlib_mutex); numthreads--; if (numthreads<1) { PHP3_TLS_PROC_SHUTDOWN(GDlibTls); - PHP3_MUTEX_UNLOCK(gdlib_mutex); - PHP3_MUTEX_FREE(gdlib_mutex); + PHP_MUTEX_UNLOCK(gdlib_mutex); + PHP_MUTEX_FREE(gdlib_mutex); return SUCCESS; } - PHP3_MUTEX_UNLOCK(gdlib_mutex); + PHP_MUTEX_UNLOCK(gdlib_mutex); #endif return SUCCESS; } Index: php4/ext/gd/gdttf.h diff -u php4/ext/gd/gdttf.h:1.2 php4/ext/gd/gdttf.h:1.3 --- php4/ext/gd/gdttf.h:1.2 Tue Feb 8 14:21:43 2000 +++ php4/ext/gd/gdttf.h Fri Feb 25 19:20:50 2000 @@ -1,8 +1,8 @@ -/* $Id: gdttf.h,v 1.2 2000/02/08 22:21:43 zeev Exp $ */ +/* $Id: gdttf.h,v 1.3 2000/02/26 03:20:50 zeev Exp $ */ #ifdef _OSD_POSIX #ifndef APACHE -#error On this EBCDIC platform, PHP3 is only supported as an Apache module. +#error On this EBCDIC platform, PHP is only supported as an Apache module. #else /*APACHE*/ #ifndef CHARSET_EBCDIC #define CHARSET_EBCDIC /* this machine uses EBCDIC, not ASCII! */ Index: php4/ext/informix/config.m4 diff -u php4/ext/informix/config.m4:1.13 php4/ext/informix/config.m4:1.14 --- php4/ext/informix/config.m4:1.13 Fri Dec 31 17:20:58 1999 +++ php4/ext/informix/config.m4 Fri Feb 25 19:20:50 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.13 2000/01/01 01:20:58 sas Exp $ +dnl $Id: config.m4,v 1.14 2000/02/26 03:20:50 zeev Exp $ PHPIFXLIB=ext/informix/libphp_ifx.a @@ -12,7 +12,7 @@ INFORMIX_WARNING=" WARNING: You asked for Informix support, but don't have \\\$INFORMIXDIR environment value set up. Configuring and compiling Informix - support to PHP3 is impossible and has been turned off. Please + support to PHP is impossible and has been turned off. Please try again after setting up your environment." AC_MSG_RESULT(no) else Index: php4/ext/informix/php_informix.h diff -u php4/ext/informix/php_informix.h:1.7 php4/ext/informix/php_informix.h:1.8 --- php4/ext/informix/php_informix.h:1.7 Sat Feb 12 06:38:01 2000 +++ php4/ext/informix/php_informix.h Fri Feb 25 19:20:50 2000 @@ -31,8 +31,8 @@ */ -#ifndef _PHP3_IFX_H -#define _PHP3_IFX_H +#ifndef _PHP_IFX_H +#define _PHP_IFX_H #if COMPILE_DL @@ -228,4 +228,4 @@ #define phpext_informix_ptr ifx_module_ptr -#endif /* _PHP3_IFX_H */ +#endif /* _PHP_IFX_H */ Index: php4/ext/interbase/php_interbase.h diff -u php4/ext/interbase/php_interbase.h:1.3 php4/ext/interbase/php_interbase.h:1.4 --- php4/ext/interbase/php_interbase.h:1.3 Fri Dec 17 14:27:23 1999 +++ php4/ext/interbase/php_interbase.h Fri Feb 25 19:20:51 2000 @@ -28,10 +28,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_interbase.h,v 1.3 1999/12/17 22:27:23 zeev Exp $ */ +/* $Id: php_interbase.h,v 1.4 2000/02/26 03:20:51 zeev Exp $ */ -#ifndef _PHP3_IBASE_H -#define _PHP3_IBASE_H +#ifndef _PHP_IBASE_H +#define _PHP_IBASE_H #if COMPILE_DL #undef HAVE_IBASE @@ -101,7 +101,7 @@ #define phpext_interbase_ptr php_ibase_module_ptr -#endif /* _PHP3_IBASE_H */ +#endif /* _PHP_IBASE_H */ /* * Local variables: Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.26 php4/ext/ldap/ldap.c:1.27 --- php4/ext/ldap/ldap.c:1.26 Wed Feb 23 07:04:36 2000 +++ php4/ext/ldap/ldap.c Fri Feb 25 19:20:51 2000 @@ -20,7 +20,7 @@ */ -/* $Id: ldap.c,v 1.26 2000/02/23 15:04:36 eschmid Exp $ */ +/* $Id: ldap.c,v 1.27 2000/02/26 03:20:51 zeev Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -175,17 +175,17 @@ { #if defined(THREAD_SAFE) ldap_module *php_ldap_module; - PHP3_MUTEX_ALLOC(ldap_mutex); - PHP3_MUTEX_LOCK(ldap_mutex); + PHP_MUTEX_ALLOC(ldap_mutex); + PHP_MUTEX_LOCK(ldap_mutex); numthreads++; if (numthreads==1){ if (!PHP3_TLS_PROC_STARTUP(ldapTLS)){ - PHP3_MUTEX_UNLOCK(ldap_mutex); - PHP3_MUTEX_FREE(ldap_mutex); + PHP_MUTEX_UNLOCK(ldap_mutex); + PHP_MUTEX_FREE(ldap_mutex); return 0; } } - PHP3_MUTEX_UNLOCK(ldap_mutex); + PHP_MUTEX_UNLOCK(ldap_mutex); if(!PHP3_TLS_THREAD_INIT(ldapTLS,php_ldap_module,ldap_module)) return 0; #if 0 /*HAVE_NSLDAP*/ @@ -246,13 +246,13 @@ #ifdef THREAD_SAFE LDAP_TLS_VARS; PHP3_TLS_THREAD_FREE(php_ldap_module); - PHP3_MUTEX_LOCK(ldap_mutex); + PHP_MUTEX_LOCK(ldap_mutex); numthreads--; if (!numthreads) { PHP3_TLS_PROC_SHUTDOWN(ldapTLS); } - PHP3_MUTEX_UNLOCK(ldap_mutex); - PHP3_MUTEX_FREE(ldap_mutex); + PHP_MUTEX_UNLOCK(ldap_mutex); + PHP_MUTEX_FREE(ldap_mutex); #endif return SUCCESS; } @@ -277,7 +277,7 @@ php_printf("<table>" "<tr><td>Total links:</td><td>%d/%s</td></tr>\n" - "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.26 2000/02/23 15:04:36 eschmid Exp $</td></tr>\n" + "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.27 2000/02/26 03:20:51 zeev Exp $</td></tr>\n" #if HAVE_NSLDAP "<tr><td>SDK Version:</td><td>%f</td></tr>" "<tr><td>Highest LDAP Protocol Supported:</td><td>%f</td></tr>" Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.10 php4/ext/msql/php_msql.c:1.11 --- php4/ext/msql/php_msql.c:1.10 Sat Feb 19 15:40:05 2000 +++ php4/ext/msql/php_msql.c Fri Feb 25 19:20:52 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.10 2000/02/19 23:40:05 zeev Exp $ */ +/* $Id: php_msql.c,v 1.11 2000/02/26 03:20:52 zeev Exp $ */ #include "php.h" #if COMPILE_DL @@ -1125,11 +1125,11 @@ } /* }}} */ -#define PHP3_MSQL_FIELD_NAME 1 -#define PHP3_MSQL_FIELD_TABLE 2 -#define PHP3_MSQL_FIELD_LEN 3 -#define PHP3_MSQL_FIELD_TYPE 4 -#define PHP3_MSQL_FIELD_FLAGS 5 +#define PHP_MSQL_FIELD_NAME 1 +#define PHP_MSQL_FIELD_TABLE 2 +#define PHP_MSQL_FIELD_LEN 3 +#define PHP_MSQL_FIELD_TYPE 4 +#define PHP_MSQL_FIELD_FLAGS 5 static void php_msql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) { @@ -1157,26 +1157,26 @@ } switch (entry_type) { - case PHP3_MSQL_FIELD_NAME: + case PHP_MSQL_FIELD_NAME: return_value->value.str.len = strlen(msql_field->name); return_value->value.str.val = estrndup(msql_field->name,return_value->value.str.len); return_value->type = IS_STRING; break; - case PHP3_MSQL_FIELD_TABLE: + case PHP_MSQL_FIELD_TABLE: return_value->value.str.len = strlen(msql_field->table); return_value->value.str.val = estrndup(msql_field->table,return_value->value.str.len); return_value->type = IS_STRING; break; - case PHP3_MSQL_FIELD_LEN: + case PHP_MSQL_FIELD_LEN: return_value->value.lval = msql_field->length; return_value->type = IS_LONG; break; - case PHP3_MSQL_FIELD_TYPE: + case PHP_MSQL_FIELD_TYPE: return_value->value.str.val = estrdup(php_msql_get_field_name(msql_field->type)); return_value->value.str.len = strlen(return_value->value.str.val); return_value->type = IS_STRING; break; - case PHP3_MSQL_FIELD_FLAGS: + case PHP_MSQL_FIELD_FLAGS: #if MSQL1 if ((msql_field->flags&NOT_NULL_FLAG) && (msql_field->flags&PRI_KEY_FLAG)) { return_value->value.str.val = estrndup("primary key not null",20); @@ -1220,7 +1220,7 @@ Get the name of the specified field in a result */ DLEXPORT PHP_FUNCTION(msql_field_name) { - php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_NAME); + php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_MSQL_FIELD_NAME); } /* }}} */ @@ -1228,7 +1228,7 @@ Get name of the table the specified field is in */ DLEXPORT PHP_FUNCTION(msql_field_table) { - php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_TABLE); + php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_MSQL_FIELD_TABLE); } /* }}} */ @@ -1236,7 +1236,7 @@ Returns the length of the specified field */ DLEXPORT PHP_FUNCTION(msql_field_len) { - php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_LEN); + php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_MSQL_FIELD_LEN); } /* }}} */ @@ -1244,7 +1244,7 @@ Get the type of the specified field in a result */ DLEXPORT PHP_FUNCTION(msql_field_type) { - php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_TYPE); + php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_MSQL_FIELD_TYPE); } /* }}} */ @@ -1252,7 +1252,7 @@ Get the flags associated with the specified field in a result */ DLEXPORT PHP_FUNCTION(msql_field_flags) { - php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_FLAGS); + php_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_MSQL_FIELD_FLAGS); } /* }}} */ Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.33 php4/ext/mysql/php_mysql.c:1.34 --- php4/ext/mysql/php_mysql.c:1.33 Sat Feb 19 23:27:46 2000 +++ php4/ext/mysql/php_mysql.c Fri Feb 25 19:20:52 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.33 2000/02/20 07:27:46 zeev Exp $ */ +/* $Id: php_mysql.c,v 1.34 2000/02/26 03:20:52 zeev Exp $ */ /* TODO: @@ -1548,11 +1548,11 @@ /* }}} */ -#define PHP3_MYSQL_FIELD_NAME 1 -#define PHP3_MYSQL_FIELD_TABLE 2 -#define PHP3_MYSQL_FIELD_LEN 3 -#define PHP3_MYSQL_FIELD_TYPE 4 -#define PHP3_MYSQL_FIELD_FLAGS 5 +#define PHP_MYSQL_FIELD_NAME 1 +#define PHP_MYSQL_FIELD_TABLE 2 +#define PHP_MYSQL_FIELD_LEN 3 +#define PHP_MYSQL_FIELD_TYPE 4 +#define PHP_MYSQL_FIELD_FLAGS 5 static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) @@ -1580,27 +1580,27 @@ } switch (entry_type) { - case PHP3_MYSQL_FIELD_NAME: + case PHP_MYSQL_FIELD_NAME: return_value->value.str.len = strlen(mysql_field->name); return_value->value.str.val = estrndup(mysql_field->name,return_value->value.str.len); return_value->type = IS_STRING; break; - case PHP3_MYSQL_FIELD_TABLE: + case PHP_MYSQL_FIELD_TABLE: return_value->value.str.len = strlen(mysql_field->table); return_value->value.str.val = estrndup(mysql_field->table,return_value->value.str.len); return_value->type = IS_STRING; break; - case PHP3_MYSQL_FIELD_LEN: + case PHP_MYSQL_FIELD_LEN: return_value->value.lval = mysql_field->length; return_value->type = IS_LONG; break; - case PHP3_MYSQL_FIELD_TYPE: + case PHP_MYSQL_FIELD_TYPE: return_value->value.str.val = php_mysql_get_field_name(mysql_field->type); return_value->value.str.len = strlen(return_value->value.str.val); return_value->value.str.val = estrndup(return_value->value.str.val, return_value->value.str.len); return_value->type = IS_STRING; break; - case PHP3_MYSQL_FIELD_FLAGS: + case PHP_MYSQL_FIELD_FLAGS: strcpy(buf, ""); #ifdef IS_NOT_NULL if (IS_NOT_NULL(mysql_field->flags)) { @@ -1679,7 +1679,7 @@ Get the name of the specified field in a result */ PHP_FUNCTION(mysql_field_name) { - php_mysql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MYSQL_FIELD_NAME); + php_mysql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_MYSQL_FIELD_NAME); } /* }}} */ @@ -1688,7 +1688,7 @@ Get name of the table the specified field is in */ PHP_FUNCTION(mysql_field_table) { - php_mysql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MYSQL_FIELD_TABLE); + php_mysql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_MYSQL_FIELD_TABLE); } /* }}} */ @@ -1697,7 +1697,7 @@ Returns the length of the specified field */ PHP_FUNCTION(mysql_field_len) { - php_mysql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MYSQL_FIELD_LEN); + php_mysql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_MYSQL_FIELD_LEN); } /* }}} */ @@ -1706,7 +1706,7 @@ Get the type of the specified field in a result */ PHP_FUNCTION(mysql_field_type) { - php_mysql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MYSQL_FIELD_TYPE); + php_mysql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_MYSQL_FIELD_TYPE); } /* }}} */ @@ -1715,7 +1715,7 @@ Get the flags associated with the specified field in a result */ PHP_FUNCTION(mysql_field_flags) { - php_mysql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MYSQL_FIELD_FLAGS); + php_mysql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_MYSQL_FIELD_FLAGS); } /* }}} */ Index: php4/ext/posix/posix.c diff -u php4/ext/posix/posix.c:1.6 php4/ext/posix/posix.c:1.7 --- php4/ext/posix/posix.c:1.6 Thu Feb 10 11:41:19 2000 +++ php4/ext/posix/posix.c Fri Feb 25 19:20:53 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: posix.c,v 1.6 2000/02/10 19:41:19 zeev Exp $ */ +/* $Id: posix.c,v 1.7 2000/02/26 03:20:53 zeev Exp $ */ #include "php.h" @@ -134,7 +134,7 @@ static PHP_MINFO_FUNCTION(posix) { - PUTS("$Revision: 1.6 $\n"); + PUTS("$Revision: 1.7 $\n"); } /* {{{ proto int posix_kill(int pid, int sig) @@ -455,7 +455,7 @@ /* }}} */ /* POSIX.1, 4.5.1 time() - Get System Time - already covered by PHP3 + already covered by PHP */ /* {{{ proto array posix_times(void) @@ -483,7 +483,7 @@ /* }}} */ /* POSIX.1, 4.6.1 getenv() - Environment Access - already covered by PHP3 + already covered by PHP */ /* {{{ proto string posix_ctermid(void) Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.110 php4/ext/session/session.c:1.111 --- php4/ext/session/session.c:1.110 Thu Feb 24 07:11:09 2000 +++ php4/ext/session/session.c Fri Feb 25 19:20:54 2000 @@ -370,17 +370,17 @@ static char *_php_create_id(int *newlen PSLS_DC) { - PHP3_MD5_CTX context; + PHP_MD5_CTX context; unsigned char digest[16]; char buf[256]; struct timeval tv; int i; gettimeofday(&tv, NULL); - PHP3_MD5Init(&context); + PHP_MD5Init(&context); sprintf(buf, "%ld%ld%0.8f", tv.tv_sec, tv.tv_usec, php_combined_lcg() * 10); - PHP3_MD5Update(&context, buf, strlen(buf)); + PHP_MD5Update(&context, buf, strlen(buf)); if (PS(entropy_length) > 0) { int fd; @@ -393,14 +393,14 @@ p = emalloc(PS(entropy_length)); n = read(fd, p, PS(entropy_length)); if (n > 0) { - PHP3_MD5Update(&context, p, n); + PHP_MD5Update(&context, p, n); } efree(p); close(fd); } } - PHP3_MD5Final(digest, &context); + PHP_MD5Final(digest, &context); for (i = 0; i < 16; i++) sprintf(buf + (i << 1), "%02x", digest[i]); Index: php4/ext/standard/config.m4 diff -u php4/ext/standard/config.m4:1.17 php4/ext/standard/config.m4:1.18 --- php4/ext/standard/config.m4:1.17 Wed Feb 23 06:13:34 2000 +++ php4/ext/standard/config.m4 Fri Feb 25 19:20:54 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.17 2000/02/23 14:13:34 sas Exp $ -*- sh -*- +dnl $Id: config.m4,v 1.18 2000/02/26 03:20:54 zeev Exp $ -*- sh -*- divert(2)dnl @@ -24,10 +24,11 @@ ]) ]) if test "$ac_cv_crypt_des" = "yes"; then - AC_DEFINE(PHP3_STD_DES_CRYPT, 1, [ ]) + ac_result=1 else - AC_DEFINE(PHP3_STD_DES_CRYPT, 0, [ ]) + ac_result=0 fi + AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, $ac_result, [Whether the system supports standard DES salt]) AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[ AC_TRY_RUN([ @@ -46,10 +47,11 @@ ]) ]) if test "$ac_cv_crypt_ext_des" = "yes"; then - AC_DEFINE(PHP3_EXT_DES_CRYPT,1, [ ]) + ac_result=1 else - AC_DEFINE(PHP3_EXT_DES_CRYPT,0, [ ]) + ac_result=0 fi + AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, $ac_result, [Whether the system supports extended DES salt]) AC_CACHE_CHECK(for MD5 crypt, ac_cv_crypt_md5,[ AC_TRY_RUN([ @@ -77,10 +79,11 @@ ]) ]) if test "$ac_cv_crypt_md5" = "yes"; then - AC_DEFINE(PHP3_MD5_CRYPT,1,[ ]) + ac_result=1 else - AC_DEFINE(PHP3_MD5_CRYPT,0,[ ]) + ac_result=0 fi + AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, $ac_result, [Whether the system supports MD5 salt]) AC_CACHE_CHECK(for Blowfish crypt, ac_cv_crypt_blowfish,[ AC_TRY_RUN([ @@ -105,10 +108,11 @@ ]) ]) if test "$ac_cv_crypt_blowfish" = "yes"; then - AC_DEFINE(PHP3_BLOWFISH_CRYPT,1,[ ]) + ac_result=1 else - AC_DEFINE(PHP3_BLOWFISH_CRYPT,0,[ ]) + ac_result=0 fi + AC_DEFINE_UNQUOTED(PHP_BLOWFISH_CRYPT, $ac_result, [Whether the system supports BlowFish salt]) ]) AC_CHECK_LIB(c, dlopen, [ Index: php4/ext/standard/crypt.c diff -u php4/ext/standard/crypt.c:1.19 php4/ext/standard/crypt.c:1.20 --- php4/ext/standard/crypt.c:1.19 Sat Feb 19 15:41:20 2000 +++ php4/ext/standard/crypt.c Fri Feb 25 19:20:54 2000 @@ -17,7 +17,7 @@ | Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: crypt.c,v 1.19 2000/02/19 23:41:20 zeev Exp $ */ +/* $Id: crypt.c,v 1.20 2000/02/26 03:20:54 zeev Exp $ */ #include <stdlib.h> #include "php.h" @@ -60,49 +60,49 @@ /* The capabilities of the crypt() function is determined by the test programs - run by configure from aclocal.m4. They will set PHP3_STD_DES_CRYPT, - PHP3_EXT_DES_CRYPT, PHP3_MD5_CRYPT and PHP3_BLOWFISH_CRYPT as appropriate + run by configure from aclocal.m4. They will set PHP_STD_DES_CRYPT, + PHP_EXT_DES_CRYPT, PHP_MD5_CRYPT and PHP_BLOWFISH_CRYPT as appropriate for the target platform */ -#if PHP3_STD_DES_CRYPT -#define PHP3_MAX_SALT_LEN 2 +#if PHP_STD_DES_CRYPT +#define PHP_MAX_SALT_LEN 2 #endif -#if PHP3_EXT_DES_CRYPT -#undef PHP3_MAX_SALT_LEN -#define PHP3_MAX_SALT_LEN 9 -#endif -#if PHP3_MD5_CRYPT -#undef PHP3_MAX_SALT_LEN -#define PHP3_MAX_SALT_LEN 12 -#endif -#if PHP3_BLOWFISH_CRYPT -#undef PHP3_MAX_SALT_LEN -#define PHP3_MAX_SALT_LEN 17 +#if PHP_EXT_DES_CRYPT +#undef PHP_MAX_SALT_LEN +#define PHP_MAX_SALT_LEN 9 +#endif +#if PHP_MD5_CRYPT +#undef PHP_MAX_SALT_LEN +#define PHP_MAX_SALT_LEN 12 +#endif +#if PHP_BLOWFISH_CRYPT +#undef PHP_MAX_SALT_LEN +#define PHP_MAX_SALT_LEN 17 #endif #if HAVE_LRAND48 -#define PHP3_CRYPT_RAND lrand48() +#define PHP_CRYPT_RAND lrand48() #else #if HAVE_RANDOM -#define PHP3_CRYPT_RAND random() +#define PHP_CRYPT_RAND random() #else -#define PHP3_CRYPT_RAND rand() +#define PHP_CRYPT_RAND rand() #endif #endif PHP_MINIT_FUNCTION(crypt) { -#if PHP3_STD_DES_CRYPT +#if PHP_STD_DES_CRYPT REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", 2, CONST_CS | CONST_PERSISTENT); #else -#if PHP3_MD5_CRYPT +#if PHP_MD5_CRYPT REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", 12, CONST_CS | CONST_PERSISTENT); #endif #endif - REGISTER_LONG_CONSTANT("CRYPT_STD_DES", PHP3_STD_DES_CRYPT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("CRYPT_EXT_DES", PHP3_EXT_DES_CRYPT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("CRYPT_MD5", PHP3_MD5_CRYPT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("CRYPT_BLOWFISH", PHP3_BLOWFISH_CRYPT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("CRYPT_STD_DES", PHP_STD_DES_CRYPT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("CRYPT_EXT_DES", PHP_EXT_DES_CRYPT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("CRYPT_MD5", PHP_MD5_CRYPT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("CRYPT_BLOWFISH", PHP_BLOWFISH_CRYPT, CONST_CS | CONST_PERSISTENT); return SUCCESS; } @@ -117,13 +117,13 @@ PHP_FUNCTION(crypt) { - char salt[PHP3_MAX_SALT_LEN+1]; + char salt[PHP_MAX_SALT_LEN+1]; pval **arg1, **arg2; - salt[0]=salt[PHP3_MAX_SALT_LEN]='\0'; + salt[0]=salt[PHP_MAX_SALT_LEN]='\0'; /* This will produce suitable results if people depend on DES-encryption available (passing always 2-character salt). At least for glibc6.1 */ - memset(&salt[1], '$', PHP3_MAX_SALT_LEN-1); + memset(&salt[1], '$', PHP_MAX_SALT_LEN-1); switch (ARG_COUNT(ht)) { case 1: @@ -136,7 +136,7 @@ RETURN_FALSE; } convert_to_string_ex(arg2); - memcpy(salt, (*arg2)->value.str.val, MIN(PHP3_MAX_SALT_LEN,(*arg2)->value.str.len)); + memcpy(salt, (*arg2)->value.str.val, MIN(PHP_MAX_SALT_LEN,(*arg2)->value.str.len)); break; default: WRONG_PARAM_COUNT; @@ -156,14 +156,14 @@ #endif #endif -#if PHP3_STD_DES_CRYPT - php_to64(&salt[0], PHP3_CRYPT_RAND, 2); +#if PHP_STD_DES_CRYPT + php_to64(&salt[0], PHP_CRYPT_RAND, 2); salt[2] = '\0'; #else -#if PHP3_MD5_CRYPT +#if PHP_MD5_CRYPT strcpy(salt, "$1$"); - php_to64(&salt[3], PHP3_CRYPT_RAND, 4); - php_to64(&salt[7], PHP3_CRYPT_RAND, 4); + php_to64(&salt[3], PHP_CRYPT_RAND, 4); + php_to64(&salt[7], PHP_CRYPT_RAND, 4); strcpy(&salt[11], "$"); #endif #endif Index: php4/ext/standard/head.h diff -u php4/ext/standard/head.h:1.11 php4/ext/standard/head.h:1.12 --- php4/ext/standard/head.h:1.11 Fri Dec 17 12:55:24 1999 +++ php4/ext/standard/head.h Fri Feb 25 19:20:54 2000 @@ -32,7 +32,7 @@ /* We are still using a PHP2-style Push/Pop list here as opposed - to the PHP3 built-in list functionality because of the nature + to the PHP built-in list functionality because of the nature of this particular list. It is just used as a structured buffer. Doing this with the built-in list code would require some changes to allow a search for the first item with a Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.68 php4/ext/standard/info.c:1.69 --- php4/ext/standard/info.c:1.68 Thu Feb 24 00:07:29 2000 +++ php4/ext/standard/info.c Fri Feb 25 19:20:54 2000 @@ -29,7 +29,7 @@ #include "zend_globals.h" /* needs ELS */ -#define PHP3_CONF_LONG(directive,value1,value2) \ +#define PHP_CONF_LONG(directive,value1,value2) \ php_printf("<tr><td bgcolor=\"" PHP_ENTRY_NAME_COLOR "\">%s</td><td bgcolor=\"" PHP_CONTENTS_COLOR "\">%ld</td><td bgcolor=\"" PHP_CONTENTS_COLOR "\">%ld</td></tr>\n",directive,value1,value2); #define SECTION(name) PUTS("<hr><h2>" name "</h2>\n") Index: php4/ext/standard/md5.c diff -u php4/ext/standard/md5.c:1.10 php4/ext/standard/md5.c:1.11 --- php4/ext/standard/md5.c:1.10 Sat Feb 19 15:41:21 2000 +++ php4/ext/standard/md5.c Fri Feb 25 19:20:54 2000 @@ -31,7 +31,7 @@ { pval **arg; char md5str[33]; - PHP3_MD5_CTX context; + PHP_MD5_CTX context; unsigned char digest[16]; int i; char *r; @@ -42,9 +42,9 @@ convert_to_string_ex(arg); md5str[0] = '\0'; - PHP3_MD5Init(&context); - PHP3_MD5Update(&context, (*arg)->value.str.val, (*arg)->value.str.len); - PHP3_MD5Final(digest, &context); + PHP_MD5Init(&context); + PHP_MD5Update(&context, (*arg)->value.str.val, (*arg)->value.str.len); + PHP_MD5Final(digest, &context); for (i = 0, r = md5str; i < 16; i++, r += 2) { sprintf(r, "%02x", digest[i]); } @@ -154,7 +154,7 @@ /* MD5 initialization. Begins an MD5 operation, writing a new context. */ -void PHP3_MD5Init(PHP3_MD5_CTX * context) +void PHP_MD5Init(PHP_MD5_CTX * context) { context->count[0] = context->count[1] = 0; /* Load magic initialization constants. @@ -169,7 +169,7 @@ operation, processing another message block, and updating the context. */ -void PHP3_MD5Update(PHP3_MD5_CTX * context, const unsigned char *input, +void PHP_MD5Update(PHP_MD5_CTX * context, const unsigned char *input, unsigned int inputLen) { unsigned int i, index, partLen; @@ -208,7 +208,7 @@ /* MD5 finalization. Ends an MD5 message-digest operation, writing the the message digest and zeroizing the context. */ -void PHP3_MD5Final(unsigned char digest[16], PHP3_MD5_CTX * context) +void PHP_MD5Final(unsigned char digest[16], PHP_MD5_CTX * context) { unsigned char bits[8]; unsigned int index, padLen; @@ -220,10 +220,10 @@ */ index = (unsigned int) ((context->count[0] >> 3) & 0x3f); padLen = (index < 56) ? (56 - index) : (120 - index); - PHP3_MD5Update(context, PADDING, padLen); + PHP_MD5Update(context, PADDING, padLen); /* Append length (before padding) */ - PHP3_MD5Update(context, bits, 8); + PHP_MD5Update(context, bits, 8); /* Store state in digest */ Encode(digest, context->state, 16); Index: php4/ext/standard/md5.h diff -u php4/ext/standard/md5.h:1.3 php4/ext/standard/md5.h:1.4 --- php4/ext/standard/md5.h:1.3 Fri Dec 17 12:51:01 1999 +++ php4/ext/standard/md5.h Fri Feb 25 19:20:54 2000 @@ -60,11 +60,11 @@ UINT4 state[4]; /* state (ABCD) */ UINT4 count[2]; /* number of bits, modulo 2^64 (lsb first) */ unsigned char buffer[64]; /* input buffer */ -} PHP3_MD5_CTX; +} PHP_MD5_CTX; -void PHP3_MD5Init PROTO_LIST((PHP3_MD5_CTX *)); -void PHP3_MD5Update PROTO_LIST((PHP3_MD5_CTX *, const unsigned char *, unsigned int)); -void PHP3_MD5Final PROTO_LIST((unsigned char[16], PHP3_MD5_CTX *)); +void PHP_MD5Init PROTO_LIST((PHP_MD5_CTX *)); +void PHP_MD5Update PROTO_LIST((PHP_MD5_CTX *, const unsigned char *, unsigned int)); +void PHP_MD5Final PROTO_LIST((unsigned char[16], PHP_MD5_CTX *)); PHP_NAMED_FUNCTION(php_if_md5); Index: php4/ext/standard/microtime.c diff -u php4/ext/standard/microtime.c:1.20 php4/ext/standard/microtime.c:1.21 --- php4/ext/standard/microtime.c:1.20 Thu Feb 24 00:39:02 2000 +++ php4/ext/standard/microtime.c Fri Feb 25 19:20:54 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: microtime.c,v 1.20 2000/02/24 08:39:02 eschmid Exp $ */ +/* $Id: microtime.c,v 1.21 2000/02/26 03:20:54 zeev Exp $ */ #include "php.h" @@ -113,27 +113,27 @@ } array_init(return_value); -#define PHP3_RUSAGE_PARA(a) \ +#define PHP_RUSAGE_PARA(a) \ add_assoc_long(return_value, #a, usg.a) #ifndef _OSD_POSIX /* BS2000 has only a few fields in the rusage struct */ - PHP3_RUSAGE_PARA(ru_oublock); - PHP3_RUSAGE_PARA(ru_inblock); - PHP3_RUSAGE_PARA(ru_msgsnd); - PHP3_RUSAGE_PARA(ru_msgrcv); - PHP3_RUSAGE_PARA(ru_maxrss); - PHP3_RUSAGE_PARA(ru_ixrss); - PHP3_RUSAGE_PARA(ru_idrss); - PHP3_RUSAGE_PARA(ru_minflt); - PHP3_RUSAGE_PARA(ru_majflt); - PHP3_RUSAGE_PARA(ru_nsignals); - PHP3_RUSAGE_PARA(ru_nvcsw); - PHP3_RUSAGE_PARA(ru_nivcsw); + PHP_RUSAGE_PARA(ru_oublock); + PHP_RUSAGE_PARA(ru_inblock); + PHP_RUSAGE_PARA(ru_msgsnd); + PHP_RUSAGE_PARA(ru_msgrcv); + PHP_RUSAGE_PARA(ru_maxrss); + PHP_RUSAGE_PARA(ru_ixrss); + PHP_RUSAGE_PARA(ru_idrss); + PHP_RUSAGE_PARA(ru_minflt); + PHP_RUSAGE_PARA(ru_majflt); + PHP_RUSAGE_PARA(ru_nsignals); + PHP_RUSAGE_PARA(ru_nvcsw); + PHP_RUSAGE_PARA(ru_nivcsw); #endif /*_OSD_POSIX*/ - PHP3_RUSAGE_PARA(ru_utime.tv_usec); - PHP3_RUSAGE_PARA(ru_utime.tv_sec); - PHP3_RUSAGE_PARA(ru_stime.tv_usec); - PHP3_RUSAGE_PARA(ru_stime.tv_sec); -#undef PHP3_RUSAGE_PARA + PHP_RUSAGE_PARA(ru_utime.tv_usec); + PHP_RUSAGE_PARA(ru_utime.tv_sec); + PHP_RUSAGE_PARA(ru_stime.tv_usec); + PHP_RUSAGE_PARA(ru_stime.tv_sec); +#undef PHP_RUSAGE_PARA } #endif /* HAVE_GETRUSAGE */ Index: php4/ext/sybase_ct/php_sybase_ct.h diff -u php4/ext/sybase_ct/php_sybase_ct.h:1.2 php4/ext/sybase_ct/php_sybase_ct.h:1.3 --- php4/ext/sybase_ct/php_sybase_ct.h:1.2 Sat Sep 4 06:03:09 1999 +++ php4/ext/sybase_ct/php_sybase_ct.h Fri Feb 25 19:20:55 2000 @@ -28,10 +28,10 @@ */ -/* $Id: php_sybase_ct.h,v 1.2 1999/09/04 13:03:09 zeev Exp $ */ +/* $Id: php_sybase_ct.h,v 1.3 2000/02/26 03:20:55 zeev Exp $ */ -#ifndef _PHP3_SYBASE_CT_H -#define _PHP3_SYBASE_CT_H +#ifndef _PHP_SYBASE_CT_H +#define _PHP_SYBASE_CT_H #if COMPILE_DL #undef HAVE_SYBASE_CT @@ -121,4 +121,4 @@ #define phpext_sybase_ct_ptr sybase_module_ptr -#endif /* _PHP3_SYBASE_CT_H */ +#endif /* _PHP_SYBASE_CT_H */ Index: php4/ext/sysvshm/sysvshm.c diff -u php4/ext/sysvshm/sysvshm.c:1.19 php4/ext/sysvshm/sysvshm.c:1.20 --- php4/ext/sysvshm/sysvshm.c:1.19 Thu Feb 24 06:31:48 2000 +++ php4/ext/sysvshm/sysvshm.c Fri Feb 25 19:20:55 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.19 2000/02/24 14:31:48 eschmid Exp $ */ +/* $Id: sysvshm.c,v 1.20 2000/02/26 03:20:55 zeev Exp $ */ /* This has been built and tested on Solaris 2.6. * It may not compile or execute correctly on other systems. @@ -131,8 +131,8 @@ /* check if shm is already initialized */ chunk_ptr= (sysvshm_chunk_head*) shm_ptr; - if(strcmp((char*)&(chunk_ptr->magic),"PHP3SM")!=0) { - strcpy((char*)&(chunk_ptr->magic),"PHP3SM"); + if(strcmp((char*)&(chunk_ptr->magic),"PHP_SM")!=0) { + strcpy((char*)&(chunk_ptr->magic),"PHP_SM"); chunk_ptr->start=sizeof(sysvshm_chunk_head); chunk_ptr->end=chunk_ptr->start; chunk_ptr->total=shm_size;