cvs: php4 /ext/sybase_ct php_sybase_ct.h
| From: | Joey Smith | Date: | Fri, 15 Sep 2000 20:54:42 +0000 |
| Subject: | cvs: php4 /ext/sybase_ct php_sybase_ct.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1764@lists.php.net to get a copy of this message | ||
joey Fri Sep 15 13:54:42 2000 EDT
Modified files:
/php4/ext/sybase_ct php_sybase_ct.h
Log:
Remove CVS conflict. Zeev, I assume you wanted context inside the globals?
Index: php4/ext/sybase_ct/php_sybase_ct.h
diff -u php4/ext/sybase_ct/php_sybase_ct.h:1.8 php4/ext/sybase_ct/php_sybase_ct.h:1.9
--- php4/ext/sybase_ct/php_sybase_ct.h:1.8 Tue Sep 12 13:54:36 2000
+++ php4/ext/sybase_ct/php_sybase_ct.h Fri Sep 15 13:54:42 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_ct.h,v 1.8 2000/09/12 20:54:36 zeev Exp $ */
+/* $Id: php_sybase_ct.h,v 1.9 2000/09/15 20:54:42 joey Exp $ */
#ifndef PHP_SYBASE_CT_H
#define PHP_SYBASE_CT_H
@@ -66,13 +66,8 @@
char *hostname;
char *server_message;
long min_server_severity, min_client_severity;
-<<<<<<< php_sybase_ct.h
CS_CONTEXT *context;
ZEND_END_MODULE_GLOBALS(sybase)
-=======
- long cfg_min_server_severity, cfg_min_client_severity;
-ZEND_END_MODULE_GLOBALS(sybase)
->>>>>>> 1.7
typedef struct {
CS_CONNECTION *connection;