From f04567b09eaa7e6c7cd955aef821668752d152cc Mon Sep 17 00:00:00 2001 From: "Thies C. Arntzen" Date: Wed, 12 May 1999 13:44:09 +0000 Subject: builds and configures again --- ext/oracle/oracle.c | 2 +- ext/oracle/oracle.h | 159 ---------------------------------------------- ext/oracle/php3_oracle.h | 160 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 161 insertions(+), 160 deletions(-) delete mode 100644 ext/oracle/oracle.h create mode 100644 ext/oracle/php3_oracle.h (limited to 'ext/oracle') diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c index 51997baf22..ebf3ecfd6a 100644 --- a/ext/oracle/oracle.c +++ b/ext/oracle/oracle.c @@ -52,7 +52,7 @@ #if HAVE_ORACLE -#include "oracle.h" +#include "php3_oracle.h" #ifdef WIN32 # include "variables.h" #else diff --git a/ext/oracle/oracle.h b/ext/oracle/oracle.h deleted file mode 100644 index 75faf27a0d..0000000000 --- a/ext/oracle/oracle.h +++ /dev/null @@ -1,159 +0,0 @@ -/* $Id$ */ - -#ifndef _PHP3_ORACLE_H -#define _PHP3_ORACLE_H - -#if HAVE_ORACLE - -#if (defined(__osf__) && defined(__alpha)) -# ifndef A_OSF -# define A_OSF -# endif -# ifndef OSF1 -# define OSF1 -# endif -# ifndef _INTRINSICS -# define _INTRINSICS -# endif -#endif /* osf alpha */ - -#include "oratypes.h" -#include "ocidfn.h" -#ifdef __STDC__ -#include "ociapr.h" -#endif - -extern php3_module_entry oracle_module_entry; -#define oracle_module_ptr &oracle_module_entry - -/* oparse flags */ -#define DEFER_PARSE 1 -#define NATIVE 1 -#define VERSION_7 2 - -#define ORANUMWIDTH 38 - -#if (defined(__osf__) && defined(__alpha)) || defined(CRAY) || defined(KSR) -#define HDA_SIZE 512 -#else -#define HDA_SIZE 256 -#endif - -#define ORAUIDLEN 32 -#define ORAPWLEN 32 -#define ORANAMELEN 32 -#define ORABUFLEN 2000 - -/* Some Oracle error codes */ -#define VAR_NOT_IN_LIST 1007 -#define NO_DATA_FOUND 1403 -#define NULL_VALUE_RETURNED 1405 - -/* Some SQL and OCI function codes */ -#define FT_INSERT 3 -#define FT_SELECT 4 -#define FT_UPDATE 5 -#define FT_DELETE 9 - -#define FC_OOPEN 14 - -typedef struct { - int open; - Lda_Def lda; - ub1 hda[HDA_SIZE]; -} oraConnection; - -typedef struct oraColumn { - sb4 dbsize; - sb2 dbtype; - text cbuf[ORANAMELEN+1]; - sb4 cbufl; - sb4 dsize; - sb2 prec; - sb2 scale; - sb2 nullok; - ub1 *buf; - sb2 indp; - ub2 col_retlen, col_retcode; -} oraColumn; - -typedef struct oraParam { - text *progv; - sword progvl; - sb2 inout; - ub2 alen; -} oraParam; - -typedef struct oraCursor { - int open; - Cda_Def cda; - text *query; - HashTable *params; - int nparams; - oraColumn *columns; - int ncols; - int fetched; - oraConnection *conn_ptr; -} oraCursor; - -typedef struct { - char *defDB; - char *defUser; - char *defPW; - long allow_persistent; - long max_persistent; - long max_links; - long num_persistent; - long num_links; - int le_conn, le_pconn, le_cursor; - HashTable *resource_list; - HashTable *resource_plist; -} oracle_module; - -extern void php3_Ora_Bind(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_Close(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_Commit(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_CommitOff(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_CommitOn(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_Do(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_Error(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_ErrorCode(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_Exec(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_Fetch(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_FetchInto(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_ColumnType(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_ColumnName(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_ColumnSize(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_GetColumn(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_NumCols(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_NumRows(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_Logoff(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_Logon(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_PLogon(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_Open(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_Parse(INTERNAL_FUNCTION_PARAMETERS); -extern void php3_Ora_Rollback(INTERNAL_FUNCTION_PARAMETERS); -extern int php3_minit_oracle(INIT_FUNC_ARGS); -extern int php3_mshutdown_oracle(SHUTDOWN_FUNC_ARGS); -extern int php3_rshutdown_oracle(SHUTDOWN_FUNC_ARGS); -extern void php3_info_oracle(ZEND_MODULE_INFO_FUNC_ARGS); -extern int php3_rinit_oracle(INIT_FUNC_ARGS); - -#else - -#define oracle_module_ptr NULL - -#endif /* HAVE_ORACLE */ - -#endif /* _PHP3_ORACLE_H */ - -/* - * Local Variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ - - - - diff --git a/ext/oracle/php3_oracle.h b/ext/oracle/php3_oracle.h new file mode 100644 index 0000000000..e936365308 --- /dev/null +++ b/ext/oracle/php3_oracle.h @@ -0,0 +1,160 @@ +/* $Id$ */ + +#ifndef _PHP3_ORACLE_H +#define _PHP3_ORACLE_H + +#if HAVE_ORACLE + +#if (defined(__osf__) && defined(__alpha)) +# ifndef A_OSF +# define A_OSF +# endif +# ifndef OSF1 +# define OSF1 +# endif +# ifndef _INTRINSICS +# define _INTRINSICS +# endif +#endif /* osf alpha */ + +#include "oratypes.h" +#include "ocidfn.h" +#ifdef __STDC__ +#include "ociapr.h" +#endif + +extern php3_module_entry oracle_module_entry; +#define oracle_module_ptr &oracle_module_entry +#define phpext_oracle_ptr &oracle_module_entry + +/* oparse flags */ +#define DEFER_PARSE 1 +#define NATIVE 1 +#define VERSION_7 2 + +#define ORANUMWIDTH 38 + +#if (defined(__osf__) && defined(__alpha)) || defined(CRAY) || defined(KSR) +#define HDA_SIZE 512 +#else +#define HDA_SIZE 256 +#endif + +#define ORAUIDLEN 32 +#define ORAPWLEN 32 +#define ORANAMELEN 32 +#define ORABUFLEN 2000 + +/* Some Oracle error codes */ +#define VAR_NOT_IN_LIST 1007 +#define NO_DATA_FOUND 1403 +#define NULL_VALUE_RETURNED 1405 + +/* Some SQL and OCI function codes */ +#define FT_INSERT 3 +#define FT_SELECT 4 +#define FT_UPDATE 5 +#define FT_DELETE 9 + +#define FC_OOPEN 14 + +typedef struct { + int open; + Lda_Def lda; + ub1 hda[HDA_SIZE]; +} oraConnection; + +typedef struct oraColumn { + sb4 dbsize; + sb2 dbtype; + text cbuf[ORANAMELEN+1]; + sb4 cbufl; + sb4 dsize; + sb2 prec; + sb2 scale; + sb2 nullok; + ub1 *buf; + sb2 indp; + ub2 col_retlen, col_retcode; +} oraColumn; + +typedef struct oraParam { + text *progv; + sword progvl; + sb2 inout; + ub2 alen; +} oraParam; + +typedef struct oraCursor { + int open; + Cda_Def cda; + text *query; + HashTable *params; + int nparams; + oraColumn *columns; + int ncols; + int fetched; + oraConnection *conn_ptr; +} oraCursor; + +typedef struct { + char *defDB; + char *defUser; + char *defPW; + long allow_persistent; + long max_persistent; + long max_links; + long num_persistent; + long num_links; + int le_conn, le_pconn, le_cursor; + HashTable *resource_list; + HashTable *resource_plist; +} oracle_module; + +extern void php3_Ora_Bind(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_Close(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_Commit(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_CommitOff(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_CommitOn(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_Do(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_Error(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_ErrorCode(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_Exec(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_Fetch(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_FetchInto(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_ColumnType(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_ColumnName(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_ColumnSize(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_GetColumn(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_NumCols(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_NumRows(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_Logoff(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_Logon(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_PLogon(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_Open(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_Parse(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_Ora_Rollback(INTERNAL_FUNCTION_PARAMETERS); +extern int php3_minit_oracle(INIT_FUNC_ARGS); +extern int php3_mshutdown_oracle(SHUTDOWN_FUNC_ARGS); +extern int php3_rshutdown_oracle(SHUTDOWN_FUNC_ARGS); +extern void php3_info_oracle(ZEND_MODULE_INFO_FUNC_ARGS); +extern int php3_rinit_oracle(INIT_FUNC_ARGS); + +#else + +#define oracle_module_ptr NULL + +#endif /* HAVE_ORACLE */ + +#endif /* _PHP3_ORACLE_H */ + +/* + * Local Variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + */ + + + + -- cgit v1.2.1