[PHP-DEV] [PATCH] Fix symbol conflict tripping up AIX compiles using xlc From: Bill Stoddard (bill <email protected>)
Date: 12/15/00

mod_php4.c already has this fix. Need to add it to the other SAPI modules.

Bill

Index: servlet.c
===================================================================
RCS file: /repository/php4/sapi/servlet/servlet.c,v
retrieving revision 1.40
diff -u -r1.40 servlet.c
--- servlet.c 2000/11/18 02:44:04 1.40
+++ servlet.c 2000/12/15 15:10:48
@@ -216,7 +216,7 @@
  * sapi maintenance
  */
 
-static sapi_module_struct sapi_module = {
+static sapi_module_struct sapi_module_conf = {
  "java_servlet", /* name */
  "Java Servlet", /* pretty name */
  
@@ -263,9 +263,9 @@
  }
 #endif
 
- sapi_startup(&sapi_module);
+ sapi_startup(&sapi_module_conf);
 
- if (php_module_startup(&sapi_module)==FAILURE) {
+ if (php_module_startup(&sapi_module_conf)==FAILURE) {
  ThrowServletException(jenv,"module startup failure");
  return;
  }

________________________________________________
Bill Stoddard stoddard <email protected> 

-- 
PHP Development Mailing List <http://www.php.net/>
To unsubscribe, e-mail: php-dev-unsubscribe <email protected>
For additional commands, e-mail: php-dev-help <email protected>
To contact the list administrators, e-mail: php-list-admin <email protected>