 |
 |
 |
 |
|
|
Date: 02/25/99
- Next message: rene: "[PHP-DEV] Re: Bug #1183 Updated: File write Access"
- Previous message: Bug Database: "[PHP-DEV] Bug #1183 Updated: File write Access"
- Next in thread: thies: "[PHP-DEV] CVS update: php3/functions"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Thursday February 25, 1999 @ 5:45
Author: thies
Update of /repository/php3/functions
In directory asf:/u/temp/cvs-serv27706
Modified Files:
oci8.c
Log Message:
made folding work....
Index: php3/functions/oci8.c
diff -c php3/functions/oci8.c:1.64 php3/functions/oci8.c:1.65
*** php3/functions/oci8.c:1.64 Tue Feb 23 12:45:33 1999
--- php3/functions/oci8.c Thu Feb 25 05:45:58 1999
***************
*** 32,45 ****
+----------------------------------------------------------------------+
*/
! /* $Id: oci8.c,v 1.64 1999/02/23 17:45:33 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"
--- 32,45 ----
+----------------------------------------------------------------------+
*/
! /* $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"
***************
*** 47,58 ****
#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.
--- 47,58 ----
#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.
***************
*** 82,93 ****
*/
/* {{{ thread safety stuff */
-
- # ifdef THREAD_SAFE
- # define OCI8_GLOBAL(a) oci8_globals->a
- # define OCI8_TLS_VARS \
- oci8_global_struct *oci8_globals = TlsGetValue(OCI8Tls);
void *oci8_mutex;
DWORD OCI8Tls;
static int numthreads=0;
--- 82,91 ----
*/
/* {{{ thread safety stuff */
+ #ifdef THREAD_SAFE
+ # define OCI8_GLOBAL(a) oci8_globals->a
+ # define OCI8_TLS_VARS oci8_global_struct *oci8_globals = TlsGetValue(OCI8Tls);
void *oci8_mutex;
DWORD OCI8Tls;
static int numthreads=0;
***************
*** 95,118 ****
typedef struct oci8_global_struct {
oci8_module php3_oci8_module;
} oci8_global_struct;
!
! # else /* !defined(THREAD_SAFE) */
# define OCI8_GLOBAL(a) a
# define OCI8_TLS_VARS
-
oci8_module php3_oci8_module;
- # endif /* defined(THREAD_SAFE) */
-
/* }}} */
/* {{{ dynamically loadable module stuff */
-
- # if COMPILE_DL
DLEXPORT php3_module_entry *get_module() { return &oci8_module_entry; };
-
- # if (WIN32|WINNT) && defined(THREAD_SAFE)
/* NOTE: You should have an oci8.def file where you export DllMain */
BOOL WINAPI DllMain(HANDLE hModule, DWORD ul_reason_for_call,
LPVOID lpReserved)
--- 93,111 ----
typedef struct oci8_global_struct {
oci8_module php3_oci8_module;
} oci8_global_struct;
! #else /* !defined(THREAD_SAFE) */
# define OCI8_GLOBAL(a) a
# define OCI8_TLS_VARS
oci8_module php3_oci8_module;
+ #endif /* defined(THREAD_SAFE) */
/* }}} */
/* {{{ dynamically loadable module stuff */
+ #if COMPILE_DL
DLEXPORT php3_module_entry *get_module() { return &oci8_module_entry; };
+ # if (WIN32|WINNT) && defined(THREAD_SAFE)
/* NOTE: You should have an oci8.def file where you export DllMain */
BOOL WINAPI DllMain(HANDLE hModule, DWORD ul_reason_for_call,
LPVOID lpReserved)
***************
*** 137,143 ****
}
# endif /* thread safe on Windows */
! # endif /* COMPILE_DL */
/* }}} */
/* {{{ startup/shutdown/info/internal function prototypes */
--- 130,136 ----
}
# endif /* thread safe on Windows */
! #endif /* COMPILE_DL */
/* }}} */
/* {{{ startup/shutdown/info/internal function prototypes */
***************
*** 601,619 ****
return errcode;
}
- #if 0 /* XXX NYI */
/* }}} */
! /* {{{ oci8_ping() */
/* test if a connection is still alive and return 1 if it is */
static int oci8_ping(oci8_connection *conn)
{
/* XXX FIXME not yet implemented */
return 1;
}
/* }}} */
! #endif
/* {{{ oci8_debug() */
--- 594,614 ----
return errcode;
}
/* }}} */
! /* {{{ NYI oci8_ping() */
+ #if 0 /* XXX NYI */
/* test if a connection is still alive and return 1 if it is */
static int oci8_ping(oci8_connection *conn)
{
/* XXX FIXME not yet implemented */
return 1;
}
+ #endif
/* }}} */
!
! /************************* INTERNAL FUNCTIONS *************************/
/* {{{ oci8_debug() */
***************
*** 1196,1202 ****
return loblen;
}
/* }}} */
- static sb4 oci8_define_callback(dvoid *, OCIDefine *, ub4, dvoid **, ub4 **, ub1 *, dvoid **, ub2 **);
/* {{{ oci8_define_callback() */
static sb4
--- 1191,1196 ----
***************
*** 1627,1633 ****
RETURN_FALSE;
}
!
/* {{{ proto string ocisavedesc(object lob)
*/
--- 1621,1627 ----
RETURN_FALSE;
}
! /* }}} */
/* {{{ proto string ocisavedesc(object lob)
*/
***************
*** 1750,1756 ****
RETURN_FALSE;
}
-
/* }}} */
/* {{{ proto string OCINewDescriptor(int connection [,int type ])
initialize a new empty descriptor LOB/FILE (LOB is default)
--- 1744,1749 ----
***************
*** 1823,1828 ****
--- 1816,1822 ----
add_method(return_value, "free", php3_oci8_freedesc);
}
+ /* }}} */
/* {{{ proto string OCIRollback(int conn)
rollback the current context
*/
***************
*** 2035,2041 ****
}
/* }}} */
! /* {{{ proto void OCIDebug(int onoff)
Toggle internal debugging output for the OCI extension.
*/
--- 2029,2035 ----
}
/* }}} */
! /* {{{ Proto void OCIDebug(int onoff)
Toggle internal debugging output for the OCI extension.
*/
***************
*** 2624,2630 ****
/* }}} */
! #endif
/*
* Local variables:
--- 2618,2624 ----
/* }}} */
! #endif /* HAVE_OCI8 */
/*
* Local variables:
-- 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>
- Next message: rene: "[PHP-DEV] Re: Bug #1183 Updated: File write Access"
- Previous message: Bug Database: "[PHP-DEV] Bug #1183 Updated: File write Access"
- Next in thread: thies: "[PHP-DEV] CVS update: php3/functions"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]