mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-01 22:03:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove CVS conflict. Zeev, I assume you wanted context inside the globals?

Browse Source
This commit is contained in:
Joey Smith 2000-09-15 20:54:42 +00:00
parent 17332d6b21
commit 618bfebfaf
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/sybase_ct/php_sybase_ct.h
View File

@ -66,13 +66,8 @@ ZEND_BEGIN_MODULE_GLOBALS(sybase)
char *hostname; char *hostname;
char *server_message; char *server_message;
long min_server_severity, min_client_severity; long min_server_severity, min_client_severity;
<<<<<<< php_sybase_ct.h
CS_CONTEXT *context; CS_CONTEXT *context;
ZEND_END_MODULE_GLOBALS(sybase) ZEND_END_MODULE_GLOBALS(sybase)
=======
long cfg_min_server_severity, cfg_min_client_severity;
ZEND_END_MODULE_GLOBALS(sybase)
>>>>>>> 1.7
typedef struct { typedef struct {
CS_CONNECTION *connection; CS_CONNECTION *connection;