cvs: /php4/ext/oracle oracle.dsp oracle.dsw /php4/ext/oracle oracle.c php_oracle.h
| From: | Thies C. Arntzen | Date: | Fri, 21 Apr 2000 15:05:11 +0000 |
| Subject: | cvs: /php4/ext/oracle oracle.dsp oracle.dsw /php4/ext/oracle oracle.c php_oracle.h | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-13892@lists.php.net to get a copy of this message | ||
thies Fri Apr 21 08:05:11 2000 EDT
Added files:
/php4/ext/oracle oracle.dsp oracle.dsw
Modified files:
/php4/ext/oracle oracle.c php_oracle.h
Log:
oracle compiles now on win32 - untested!
Index: php4/ext/oracle/oracle.c
diff -u php4/ext/oracle/oracle.c:1.41 php4/ext/oracle/oracle.c:1.42
--- php4/ext/oracle/oracle.c:1.41 Thu Apr 6 14:07:41 2000
+++ php4/ext/oracle/oracle.c Fri Apr 21 08:04:40 2000
@@ -40,13 +40,7 @@
#include "ext/standard/info.h"
-#ifdef WIN32
-# include "variables.h"
-#else
-# include "build-defs.h"
-#endif
-
#ifndef min
#define min(a, b) ((a) > (b) ? (b) : (a))
#endif
@@ -280,8 +274,6 @@
PHP_MINIT_FUNCTION(oracle)
{
-
- ELS_FETCH();
#ifdef ZTS
ora_globals_id = ts_allocate_id(sizeof(php_ora_globals), (ts_allocate_ctor) php_ora_init_globals,
NULL);
Index: php4/ext/oracle/php_oracle.h
diff -u php4/ext/oracle/php_oracle.h:1.4 php4/ext/oracle/php_oracle.h:1.5
--- php4/ext/oracle/php_oracle.h:1.4 Fri Feb 11 07:34:10 2000
+++ php4/ext/oracle/php_oracle.h Fri Apr 21 08:04:40 2000
@@ -1,4 +1,4 @@
-/* $Id: php_oracle.h,v 1.4 2000/02/11 15:34:10 andrei Exp $ */
+/* $Id: php_oracle.h,v 1.5 2000/04/21 15:04:40 thies Exp $ */
/* synced with oracle.h,v 1.40 1999/06/01 08:11:04 thies Exp $ */
@@ -21,9 +21,7 @@
#include "oratypes.h"
#include "ocidfn.h"
-#ifdef __STDC__
#include "ociapr.h"
-#endif
extern zend_module_entry oracle_module_entry;
#define phpext_oracle_ptr &oracle_module_entry