sas Tue Jan 21 06:12:06 2003 EDT
Modified files: (Branch: PHP_4)
/php4/main SAPI.h
Log:
cvs server: warning: file `main/SAPI.h' seems to still contain conflict indicators
..but it checks it in nevertheless.
Index: php4/main/SAPI.h
diff -u php4/main/SAPI.h:1.87.2.4.2.1 php4/main/SAPI.h:1.87.2.4.2.2
--- php4/main/SAPI.h:1.87.2.4.2.1 Tue Jan 21 06:11:23 2003
+++ php4/main/SAPI.h Tue Jan 21 06:12:06 2003
@@ -230,12 +230,6 @@
char *executable_location;
int php_ini_ignore;
-<<<<<<< SAPI.h
-
- int (*get_fd)(int *fd TSRMLS_DC);
-
- int (*force_http_10)(TSRMLS_D);
-=======
int (*get_fd)(int *fd TSRMLS_DC);
@@ -243,7 +237,6 @@
int (*get_target_uid)(uid_t * TSRMLS_DC);
int (*get_target_gid)(gid_t * TSRMLS_DC);
->>>>>>> 1.97
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
