cvs: /php4/ext/oci8 oci8.c

thies Tue Sep 28 07:12:32 1999 EDT Modified files: /php4/ext/oci8 oci8.c Log: initialize OCI in threaded mode if ZTS is defined. Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.27 php4/ext/oci8/oci8.c:1.28 --- php4/ext/oci8/oci8.c:1.27 Fri Sep 17 04:25:03 1999 +++ php4/ext/oci8/oci8.c Tue Sep 28 07:12:32 1999 @@ -22,7 +22,7 @@ #define OCI_USE_EMALLOC 0 /* set this to 1 if you want to use the php memory manager! */ -/* $Id: oci8.c,v 1.27 1999/09/17 08:25:03 thies Exp $ */ +/* $Id: oci8.c,v 1.28 1999/09/28 11:12:32 thies Exp $ */ /* TODO list: * @@ -376,10 +376,16 @@ REGISTER_LONG_CONSTANT("OCI_D_LOB",OCI_DTYPE_LOB, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("OCI_D_ROWID",OCI_DTYPE_ROWID, CONST_CS | CONST_PERSISTENT); +#ifdef ZTS + #define PHP_OCI_INIT_MODE OCI_THREADED +#else + #define PHP_OCI_INIT_MODE OCI_DEFAULT +#endif + #if OCI_USE_EMALLOC - OCIInitialize(OCI_DEFAULT, NULL, ocimalloc, ocirealloc, ocifree); + OCIInitialize(PHP_OCI_INIT_MODE, NULL, ocimalloc, ocirealloc, ocifree); #else - OCIInitialize(OCI_DEFAULT, NULL, NULL, NULL, NULL); + OCIInitialize(PHP_OCI_INIT_MODE, NULL, NULL, NULL, NULL); #endif return SUCCESS;