- Convert 'PHP3' to 'PHP'

- Avoid declaring crypt() related salt types twice

diff --git a/acconfig.h.in b/acconfig.h.in
index 2194c1cd4a11aa20318487ce0fe05c1502bd6be3..3293480f9182f7340aaa3d18df7b3e906cc5d403 100644 (file)
--- a/acconfig.h.in
+++ b/acconfig.h.in
@@ -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

diff --git a/configure.in b/configure.in
index 9b6f957a1a3f3d81ff344c682a606cade0134857..5fae5b2409faddf5c924ce431a64d3dfb737f819 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -532,14 +532,14 @@ AC_ARG_ENABLE(url-fopen-wrapper,
                           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)
 ])
 

diff --git a/ext/cpdf/php_cpdf.h b/ext/cpdf/php_cpdf.h
index 517c0189440a40ac507aa3062323a3248280343c..cf7cd7dc7a9ae014d91b355364f3baaf9e3f8e8a 100644 (file)
--- a/ext/cpdf/php_cpdf.h
+++ b/ext/cpdf/php_cpdf.h
@@ -120,4 +120,4 @@ PHP_FUNCTION(cpdf_set_action_url);
 #define cpdf_module_ptr NULL
 #endif
 #define phpext_cpdf_ptr cpdf_module_ptr
-#endif /* _PHP3_PDF_H */
+#endif /* _PHP_PDF_H */

diff --git a/ext/cybercash/cyberlib.php b/ext/cybercash/cyberlib.php
index 5625e92c3e803fba277bddb51899d38cccb11888..885be10d5263e0145a963f666260e305fbe39570 100644 (file)
--- a/ext/cybercash/cyberlib.php
+++ b/ext/cybercash/cyberlib.php
@@ -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    *

diff --git a/ext/dav/dav.c b/ext/dav/dav.c
index 5d9cb5d6bd9475ed199d0ddbb0b4baa75a5a6f6a..f82385968a17ce1abecfd363d6989be8263f0757 100644 (file)
--- a/ext/dav/dav.c
+++ b/ext/dav/dav.c
@@ -105,19 +105,19 @@ PHP_MINIT_FUNCTION(phpdav)
 {
 #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 @@ PHP_MSHUTDOWN_FUNCTION(phpdav)
     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;
 }

diff --git a/ext/db/db.c b/ext/db/db.c
index 34d1dc7faf9fb864eb2480845732ef60de695c38..0373c3b27b1f1835f04ef0e64a2a387eca26f500 100644 (file)
--- a/ext/db/db.c
+++ b/ext/db/db.c
@@ -1071,19 +1071,19 @@ PHP_MINIT_FUNCTION(db)
 {
 #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 @@ static PHP_MSHUTDOWN_FUNCTION(db)
 {
 #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;
 }

diff --git a/ext/domxml/php_domxml.h b/ext/domxml/php_domxml.h
index dc906b79e95d2a3d3482b6718c12c03d6b454b0d..5bd7ccb44f7c23986648f24dff9d0b77b3fedff8 100644 (file)
--- a/ext/domxml/php_domxml.h
+++ b/ext/domxml/php_domxml.h
@@ -72,4 +72,4 @@ PHP_FUNCTION(domxml_attrname);
 #endif /* HAVE_DOMXML */
 #define phpext_domxml_ptr php_domxml_module_ptr
 
-#endif /* _PHP3_DIR_H */
+#endif /* _PHP_DIR_H */

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 91be0bd06e01d8ba64c8f923a49a8587ca2672a8..6d2fb73c99a230f2274bc63bacb4e0cbf9437611 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -181,19 +181,19 @@ PHP_MINIT_FUNCTION(gd)
 {
 #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 @@ PHP_MSHUTDOWN_FUNCTION(gd)
        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;
 }

diff --git a/ext/gd/gdttf.h b/ext/gd/gdttf.h
index 8c533e6d919dd5339d55e01976de7570ed0bc89a..4f32129702d9f11dfd48e5e14effdedb7c3a9a81 100644 (file)
--- a/ext/gd/gdttf.h
+++ b/ext/gd/gdttf.h
@@ -2,7 +2,7 @@
 
 #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! */

diff --git a/ext/informix/config.m4 b/ext/informix/config.m4
index dfcb3fe824592a63f63979c86577a40e168efcaa..c00e9d4d45244c71d58c4091e046a8f7c8b9d35d 100644 (file)
--- a/ext/informix/config.m4
+++ b/ext/informix/config.m4
@@ -12,7 +12,7 @@ AC_ARG_WITH(informix,
       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

diff --git a/ext/informix/php_informix.h b/ext/informix/php_informix.h
index c12f453a886e8a0d56c51faed658cdf1b5628539..d5595ce2c96dbff64590b7e3d22895202da20590 100644 (file)
--- a/ext/informix/php_informix.h
+++ b/ext/informix/php_informix.h
@@ -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 @@ typedef struct _IFX_IDRES {
 
 #define phpext_informix_ptr ifx_module_ptr
 
-#endif /* _PHP3_IFX_H */
+#endif /* _PHP_IFX_H */

diff --git a/ext/interbase/php_interbase.h b/ext/interbase/php_interbase.h
index e06f05282e4b941436b6c2cad06c65c0d72dca15..d5ae548ce42a8ae585b7835ebc77a2ddf34e0630 100644 (file)
--- a/ext/interbase/php_interbase.h
+++ b/ext/interbase/php_interbase.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#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 @@ extern ibase_module php_ibase_module;
 
 #define phpext_interbase_ptr php_ibase_module_ptr
 
-#endif /* _PHP3_IBASE_H */
+#endif /* _PHP_IBASE_H */
 
 /*
  * Local variables:

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index a50f1e2e60920d9c2c372008f6706683f9ada1ed..55ebad97ff840932cf85a8532bffa95a12d417db 100644 (file)
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -175,17 +175,17 @@ PHP_MINIT_FUNCTION(ldap)
 {
 #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 @@ PHP_MSHUTDOWN_FUNCTION(ldap)
 #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;
 }

diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
index a4c85a97d1278fb2454d236546c0afa6274d09d9..396a38564967d591382a884415b0c5b2783f1839 100644 (file)
--- a/ext/msql/php_msql.c
+++ b/ext/msql/php_msql.c
@@ -1125,11 +1125,11 @@ DLEXPORT PHP_FUNCTION(msql_field_seek)
 }
 /* }}} */
 
-#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 @@ static void php_msql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
        }
        
        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 @@ static void php_msql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
    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 @@ DLEXPORT PHP_FUNCTION(msql_field_name)
    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 @@ DLEXPORT PHP_FUNCTION(msql_field_table)
    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 @@ DLEXPORT PHP_FUNCTION(msql_field_len)
    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 @@ DLEXPORT PHP_FUNCTION(msql_field_type)
    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);
 }
 /* }}} */
 

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index b7ab8336d1b1c265fb2882e865594a16204fe2cb..d04730f8d9161a2c293b658d7e4941546ec58309 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1548,11 +1548,11 @@ PHP_FUNCTION(mysql_field_seek)
 /* }}} */
 
 
-#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 @@ static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
        }
        
        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 @@ static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
    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 @@ PHP_FUNCTION(mysql_field_name)
    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 @@ PHP_FUNCTION(mysql_field_table)
    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 @@ PHP_FUNCTION(mysql_field_len)
    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 @@ PHP_FUNCTION(mysql_field_type)
    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);
 }
 /* }}} */
 

diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index 8d32d82a69e27066b32b3c053c0287802236eb47..1dd6f7eae9eb944f503be98a62f81c61825069a6 100644 (file)
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -455,7 +455,7 @@ PHP_FUNCTION(posix_uname)
 /* }}} */
 
 /* 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 @@ PHP_FUNCTION(posix_times)
 /* }}} */
 
 /* POSIX.1, 4.6.1 getenv() - Environment Access
-                                                       already covered by PHP3
+                                                       already covered by PHP
 */
 
 /* {{{ proto string posix_ctermid(void) 

diff --git a/ext/session/session.c b/ext/session/session.c
index 9a531a24aba96c1dabd72fb0791d1dc6bf8bd6ad..12fd84b75634419c4fe7f4634cf5e6e83daeceae 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -370,17 +370,17 @@ static void _php_session_decode(const char *val, int vallen PSLS_DC)
 
 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 @@ static char *_php_create_id(int *newlen PSLS_DC)
                        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]);

diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index a7ba604ff3bd57b2d8ebd9550fc866892796b8b3..1da0f17d8d88868d29d56fdb9a81940a4853fac3 100644 (file)
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -24,10 +24,11 @@ main() {
   ])
   ])
   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 @@ main() {
   ])
   ])
   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 @@ main() {
   ])
   ])
   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 @@ main() {
   ])
   ])
   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, [

diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index 1eeb6818dfe108b14b2559e8ebdc6cc2674d7ac1..1d5c1bd5c31ae29a57487f4832ff607cae025dd3 100644 (file)
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -60,49 +60,49 @@ zend_module_entry crypt_module_entry = {
 
 /* 
    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
+#if PHP_EXT_DES_CRYPT
+#undef PHP_MAX_SALT_LEN
+#define PHP_MAX_SALT_LEN 9
 #endif
-#if PHP3_MD5_CRYPT
-#undef PHP3_MAX_SALT_LEN
-#define PHP3_MAX_SALT_LEN 12
+#if PHP_MD5_CRYPT
+#undef PHP_MAX_SALT_LEN
+#define PHP_MAX_SALT_LEN 12
 #endif
-#if PHP3_BLOWFISH_CRYPT
-#undef PHP3_MAX_SALT_LEN
-#define PHP3_MAX_SALT_LEN 17
+#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 @@ static void php_to64(char *s, long v, int n)      {
 
 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 @@ PHP_FUNCTION(crypt)
                                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 @@ PHP_FUNCTION(crypt)
 #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

diff --git a/ext/standard/head.h b/ext/standard/head.h
index 10d1a5360333e5712914fe33f347df0a29b930dd..db7b383e8e5a8b732a87bf9fd10431afeae3915c 100644 (file)
--- a/ext/standard/head.h
+++ b/ext/standard/head.h
@@ -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

diff --git a/ext/standard/info.c b/ext/standard/info.c
index bba5693d49d64ff4700fa5f82848b9a73f3e0a0b..f6d25ce3d4b0ccec3ab6411f71f9d422bf3f2771 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -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")

diff --git a/ext/standard/md5.c b/ext/standard/md5.c
index bb9237baa51cb38bb947a4a9a781e43522f80f2d..2993d71e7456278ad7b546c206f35728cd4b2266 100644 (file)
--- a/ext/standard/md5.c
+++ b/ext/standard/md5.c
@@ -31,7 +31,7 @@ PHP_NAMED_FUNCTION(php_if_md5)
 {
        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 @@ PHP_NAMED_FUNCTION(php_if_md5)
        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 @@ static unsigned char PADDING[64] =
 
 /* 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 @@ void PHP3_MD5Init(PHP3_MD5_CTX * context)
    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 @@ void PHP3_MD5Update(PHP3_MD5_CTX * context, const unsigned char *input,
 /* 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 @@ void PHP3_MD5Final(unsigned char digest[16], PHP3_MD5_CTX * context)
         */
        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);

diff --git a/ext/standard/md5.h b/ext/standard/md5.h
index f75459074827f535d2d8896a562e462dec1c12be..b29b0ef14e6fef666bc3691bbf75ce958a538575 100644 (file)
--- a/ext/standard/md5.h
+++ b/ext/standard/md5.h
@@ -60,11 +60,11 @@ typedef struct {
        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);
 

diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c
index 7c910676c95d65dc21817ea9312e5ea1b9979348..e0746d8e3d2f0b48f9249236f3dee6e0a331849d 100644 (file)
--- a/ext/standard/microtime.c
+++ b/ext/standard/microtime.c
@@ -113,27 +113,27 @@ PHP_FUNCTION(getrusage)
        }
 
        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 */
 

diff --git a/ext/sybase_ct/php_sybase_ct.h b/ext/sybase_ct/php_sybase_ct.h
index 5388062e8f163583c6c178dea855b009d0018ea8..466ed536f5f00d68c1916764f475653893df503c 100644 (file)
--- a/ext/sybase_ct/php_sybase_ct.h
+++ b/ext/sybase_ct/php_sybase_ct.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#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 @@ typedef struct {
 
 #define phpext_sybase_ct_ptr sybase_module_ptr
 
-#endif /* _PHP3_SYBASE_CT_H */
+#endif /* _PHP_SYBASE_CT_H */

diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index 15107ced199b972e7c480185e9b16931b9a4e771..f3371de25980e4c5e5958b59db52cad8bcba4f8f 100644 (file)
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -131,8 +131,8 @@ PHP_FUNCTION(shm_attach)
 
        /* 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;

diff --git a/main/config.w32.h b/main/config.w32.h
index f078785d3d0dfaf18b94491f1f23978db8a6e6e7..28ad26099b8216c4d8884ad25736b5caf38aabd1 100644 (file)
--- a/main/config.w32.h
+++ b/main/config.w32.h
@@ -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

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index e80c391d2a42cba02ddc579b8c78789895f07017..bd3db7c116daaab1a4185a76c4a13b4563bcef05 100644 (file)
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -190,7 +190,7 @@ PHPAPI FILE *php_fopen_wrapper(char *path, char *mode, int options, int *issock,
 
        /* 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);
        }