[PHP-DEV] CVS update: php3/functions From: thies (php-dev <email protected>)
Date: 02/25/99

Date: Thursday February 25, 1999 @ 7:14
Author: thies

Update of /repository/php3/functions
In directory asf:/u/temp/cvs-serv29070/functions

Modified Files:
        oci8.c
Log Message:
just moving lines around...

Index: php3/functions/oci8.c
diff -c php3/functions/oci8.c:1.65 php3/functions/oci8.c:1.66
*** php3/functions/oci8.c:1.65 Thu Feb 25 05:45:58 1999
--- php3/functions/oci8.c Thu Feb 25 07:14:09 1999
***************
*** 1,4 ****
- #define OCI8_USE_EMALLOC 0 /* set this to 1 if you want to use the php memory manager! */
  /*
     +----------------------------------------------------------------------+
     | PHP HTML Embedded Scripting Language Version 3.0 |
--- 1,3 ----
***************
*** 31,62 ****
     | Digital Collections, http://www.digicol.de/ |
     +----------------------------------------------------------------------+
   */
-
- /* $Id: oci8.c,v 1.65 1999/02/25 10:45:58 thies Exp $ */
-
- #if defined(COMPILE_DL)
- # ifdef THREAD_SAFE
- # undef THREAD_SAFE /* XXX no need in 3.0 */
- # endif
- # include "dl/phpdl.h"
- #endif
-
- #include "php.h"
- #include "internal_functions.h"
- #include "php3_oci8.h"
-
- #if HAVE_OCI8
  
! #include "php3_list.h"
! #if !(WIN32|WINNT)
! # include "build-defs.h"
! #endif
! #include "snprintf.h"
! #include "head.h"
  
! /* These {{{ and }}} lines are folding marks for Emacs, in case you
! * wondered.
! */
  
  /* TODO list:
   *
--- 30,39 ----
     | Digital Collections, http://www.digicol.de/ |
     +----------------------------------------------------------------------+
   */
  
! #define OCI8_USE_EMALLOC 0 /* set this to 1 if you want to use the php memory manager! */
  
! /* $Id: oci8.c,v 1.66 1999/02/25 12:14:09 thies Exp $ */
  
  /* TODO list:
   *
***************
*** 79,86 ****
--- 56,87 ----
   * - there seems to be a bug in OCI where it returns ORA-01406 (value truncated) - whereby it isn't (search for 01406 in the source)
   * this seems to happen for NUMBER values only...
   * - make OCIInternalDebug accept a mask of flags....
+ * - better NULL handling
   */
  
+ /* {{{ includes & stuff */
+
+ #if defined(COMPILE_DL)
+ # ifdef THREAD_SAFE
+ # undef THREAD_SAFE /* XXX no need in 3.0 */
+ # endif
+ # include "dl/phpdl.h"
+ #endif
+
+ #include "php.h"
+ #include "internal_functions.h"
+ #include "php3_oci8.h"
+
+ #if HAVE_OCI8
+
+ #include "php3_list.h"
+ #if !(WIN32|WINNT)
+ # include "build-defs.h"
+ #endif
+ #include "snprintf.h"
+ #include "head.h"
+
+ /* }}} */
  /* {{{ thread safety stuff */
  
  #ifdef THREAD_SAFE 

--
PHP Development Mailing List   http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe <email protected>
For help: php-dev-help <email protected>