cvs: /php4/ext/odbc config.h.stub config.m4 php3_velocis.h php_odbc.c php_odbc.h velocis.c

ssb Tue Nov 9 09:29:00 1999 EDT Modified files: /php4/ext/odbc config.h.stub config.m4 php3_velocis.h php_odbc.c php_odbc.h velocis.c Log: Clean up ODBC HAVE_XXX symbols, compile fixes for OpenLink and Solid. #The Solid support still does not link, though (looks like a side-effect of #the way the Solid libs are named and our stubborn friend libtool). #This can wait until after 4.0b3. Index: php4/ext/odbc/config.h.stub diff -u php4/ext/odbc/config.h.stub:1.5 php4/ext/odbc/config.h.stub:1.6 --- php4/ext/odbc/config.h.stub:1.5 Thu Oct 28 16:33:43 1999 +++ php4/ext/odbc/config.h.stub Tue Nov 9 09:28:59 1999 @@ -1,11 +1,11 @@ -#define HAVE_SOLID 0 -#define HAVE_IBMDB2 0 -#define HAVE_IODBC 0 -#define HAVE_ESOOB 0 -#define HAVE_UNIXODBC 0 -#define HAVE_OPENLINK 0 -#define HAVE_ADABAS 0 -#define HAVE_CODBC 0 -#define HAVE_UODBC 0 -#define HAVE_EMPRESS 0 -#define HAVE_VELOCIS 0 +#undef HAVE_SOLID +#undef HAVE_IBMDB2 +#undef HAVE_IODBC +#undef HAVE_ESOOB +#undef HAVE_UNIXODBC +#undef HAVE_OPENLINK +#undef HAVE_ADABAS +#undef HAVE_CODBC +#undef HAVE_UODBC +#undef HAVE_EMPRESS +#undef HAVE_VELOCIS Index: php4/ext/odbc/config.m4 diff -u php4/ext/odbc/config.m4:1.8 php4/ext/odbc/config.m4:1.9 --- php4/ext/odbc/config.m4:1.8 Tue Nov 9 08:31:16 1999 +++ php4/ext/odbc/config.m4 Tue Nov 9 09:28:59 1999 @@ -80,7 +80,7 @@ AC_MSG_CHECKING(for Solid support) AC_ARG_WITH(solid, [ --with-solid[=DIR] Include Solid support. DIR is the Solid base - install directory, defaults to /usr/local/solid], + install directory, defaults to /usr/local/solid], [ if test "$withval" = "yes"; then withval=/usr/local/solid @@ -88,13 +88,13 @@ if test "$withval" != "no"; then ODBC_INCDIR=$withval/include ODBC_LIBDIR=$withval/lib - ODBC_INCLUDE=-I$ODBC_INCDIR - ODBC_TYPE=solid - AC_DEFINE(HAVE_SOLID) - AC_MSG_RESULT(yes) - AC_FIND_SOLID_LIBS($ODBC_LIBDIR) + ODBC_INCLUDE=-I$ODBC_INCDIR + ODBC_TYPE=solid + AC_DEFINE(HAVE_SOLID) + AC_MSG_RESULT(yes) + AC_FIND_SOLID_LIBS($ODBC_LIBDIR) else - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) fi ],[ AC_MSG_RESULT(no) @@ -116,8 +116,8 @@ ODBC_LIBDIR=$withval/lib fi ODBC_INCLUDE=-I$ODBC_INCDIR - ODBC_TYPE=db2 - ODBC_LIBS="-ldb2" + ODBC_TYPE=db2 + ODBC_LIBS="-ldb2" AC_DEFINE(HAVE_IBMDB2) AC_MSG_RESULT(yes) @@ -334,7 +334,7 @@ if test -n "$ODBC_TYPE"; then INCLUDES="$INCLUDES $ODBC_INCLUDE" EXTRA_LIBS="$EXTRA_LIBS $ODBC_LFLAGS $ODBC_LIBS" - AC_DEFINE(HAVE_UODBC, 1) + AC_DEFINE(HAVE_UODBC) AC_SUBST(ODBC_INCDIR) AC_SUBST(ODBC_INCLUDE) AC_SUBST(ODBC_LIBDIR) Index: php4/ext/odbc/php3_velocis.h diff -u php4/ext/odbc/php3_velocis.h:1.4 php4/ext/odbc/php3_velocis.h:1.5 --- php4/ext/odbc/php3_velocis.h:1.4 Mon Aug 2 12:06:13 1999 +++ php4/ext/odbc/php3_velocis.h Tue Nov 9 09:28:59 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php3_velocis.h,v 1.4 1999/08/02 16:06:13 andrey Exp $ */ +/* $Id: php3_velocis.h,v 1.5 1999/11/09 14:28:59 ssb Exp $ */ #ifndef _PHP3_VELOCIS_H #define _PHP3_VELOCIS_H @@ -38,7 +38,7 @@ #define HAVE_VELOCIS 1 #endif -#if HAVE_VELOCIS && !HAVE_UODBC +#if defined(HAVE_VELOCIS) && !HAVE_UODBC #define UNIX #include <sql.h> #include <sqlext.h> Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.10 php4/ext/odbc/php_odbc.c:1.11 --- php4/ext/odbc/php_odbc.c:1.10 Thu Oct 28 16:33:43 1999 +++ php4/ext/odbc/php_odbc.c Tue Nov 9 09:28:59 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.10 1999/10/28 20:33:43 rasmus Exp $ */ +/* $Id: php_odbc.c,v 1.11 1999/11/09 14:28:59 ssb Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -147,7 +147,7 @@ res->values = NULL; } if (res->stmt) { -#if HAVE_SOLID +#ifdef HAVE_SOLID SQLTransact(res->conn_ptr->henv, res->conn_ptr->hdbc, (UWORD)SQL_COMMIT); #endif @@ -536,7 +536,7 @@ result->values[i].value = NULL; break; -#if HAVE_ADABAS +#ifdef HAVE_ADABAS case SQL_TIMESTAMP: result->values[i].value = (char *)emalloc(27); SQLBindCol(result->stmt, (UWORD)(i+1), SQL_C_CHAR, result->values[i].value, @@ -913,7 +913,7 @@ odbc_result *result = NULL; odbc_connection *conn; RETCODE rc; -#if HAVE_SQL_EXTENDED_FETCH +#ifdef HAVE_SQL_EXTENDED_FETCH UDWORD scrollopts; #endif @@ -951,7 +951,7 @@ RETURN_FALSE; } -#if HAVE_SQL_EXTENDED_FETCH +#ifdef HAVE_SQL_EXTENDED_FETCH /* Solid doesn't have ExtendedFetch, if DriverManager is used, get Info, whether Driver supports ExtendedFetch */ rc = SQLGetInfo(conn->hdbc, SQL_FETCH_DIRECTION, (void *) &scrollopts, sizeof(scrollopts), NULL); @@ -1010,7 +1010,7 @@ RETCODE rc; SWORD sql_c_type; char *buf = NULL; -#if HAVE_SQL_EXTENDED_FETCH +#ifdef HAVE_SQL_EXTENDED_FETCH UDWORD crow; UWORD RowStatus[1]; SDWORD rownum = -1; @@ -1066,7 +1066,7 @@ } } -#if HAVE_SQL_EXTENDED_FETCH +#ifdef HAVE_SQL_EXTENDED_FETCH if (result->fetch_abs) { if (rownum > 0) rc = SQLExtendedFetch(result->stmt,SQL_FETCH_ABSOLUTE,rownum,&crow,RowStatus); @@ -1079,7 +1079,7 @@ if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) RETURN_FALSE; -#if HAVE_SQL_EXTENDED_FETCH +#ifdef HAVE_SQL_EXTENDED_FETCH if (rownum > 0 && result->fetch_abs) result->fetched = rownum; else @@ -1145,7 +1145,7 @@ } /* }}} */ -#if HAVE_SOLID +#ifdef HAVE_SOLID PHP_FUNCTION(solid_fetch_prev) { odbc_result *result; @@ -1181,7 +1181,7 @@ odbc_result *result; RETCODE rc; pval **pv_res, **pv_row; -#if HAVE_SQL_EXTENDED_FETCH +#ifdef HAVE_SQL_EXTENDED_FETCH UDWORD crow; UWORD RowStatus[1]; #endif @@ -1204,7 +1204,7 @@ RETURN_FALSE; } -#if HAVE_SQL_EXTENDED_FETCH +#ifdef HAVE_SQL_EXTENDED_FETCH if (result->fetch_abs) { if (numArgs > 1) rc = SQLExtendedFetch(result->stmt,SQL_FETCH_ABSOLUTE,rownum,&crow,RowStatus); @@ -1240,7 +1240,7 @@ RETCODE rc; SDWORD fieldsize; pval **pv_res, **pv_field; -#if HAVE_SQL_EXTENDED_FETCH +#ifdef HAVE_SQL_EXTENDED_FETCH UDWORD crow; UWORD RowStatus[1]; #endif @@ -1289,7 +1289,7 @@ if (result->fetched == 0) { /* User forgot to call odbc_fetchrow(), let's do it here */ -#if HAVE_SQL_EXTENDED_FETCH +#ifdef HAVE_SQL_EXTENDED_FETCH if (result->fetch_abs) rc = SQLExtendedFetch(result->stmt, SQL_FETCH_NEXT, 1, &crow,RowStatus); else @@ -1409,7 +1409,7 @@ RETCODE rc; pval **pv_res, **pv_format; SWORD sql_c_type; -#if HAVE_SQL_EXTENDED_FETCH +#ifdef HAVE_SQL_EXTENDED_FETCH UDWORD crow; UWORD RowStatus[1]; #endif @@ -1429,7 +1429,7 @@ php_error(E_WARNING, "No tuples available at this result index"); RETURN_FALSE; } -#if HAVE_SQL_EXTENDED_FETCH +#ifdef HAVE_SQL_EXTENDED_FETCH if (result->fetch_abs) rc = SQLExtendedFetch(result->stmt,SQL_FETCH_NEXT,1,&crow,RowStatus); else @@ -1509,7 +1509,7 @@ } php_printf("</tr>\n"); -#if HAVE_SQL_EXTENDED_FETCH +#ifdef HAVE_SQL_EXTENDED_FETCH if (result->fetch_abs) rc = SQLExtendedFetch(result->stmt,SQL_FETCH_NEXT,1,&crow,RowStatus); else @@ -1565,11 +1565,11 @@ SQLAllocEnv(&((*conn)->henv)); SQLAllocConnect((*conn)->henv, &((*conn)->hdbc)); -#if HAVE_SOLID +#ifdef HAVE_SOLID SQLSetConnectOption((*conn)->hdbc, SQL_TRANSLATE_OPTION, SQL_SOLID_XLATOPT_NOCNV); #endif -#if HAVE_OPENLINK +#ifdef HAVE_OPENLINK { char dsnbuf[300]; short dsnbuflen; @@ -1588,7 +1588,7 @@ return FALSE; } } -#if HAVE_EMPRESS +#ifdef HAVE_EMPRESS { int direct = 0; char dsnbuf[300]; Index: php4/ext/odbc/php_odbc.h diff -u php4/ext/odbc/php_odbc.h:1.6 php4/ext/odbc/php_odbc.h:1.7 --- php4/ext/odbc/php_odbc.h:1.6 Thu Oct 28 16:33:43 1999 +++ php4/ext/odbc/php_odbc.h Tue Nov 9 09:28:59 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.h,v 1.6 1999/10/28 20:33:43 rasmus Exp $ */ +/* $Id: php_odbc.h,v 1.7 1999/11/09 14:28:59 ssb Exp $ */ #ifndef _PHP_ODBC_H #define _PHP_ODBC_H @@ -45,22 +45,24 @@ /* checking in the same order as in configure.in */ -#if HAVE_SOLID /* Solid Server */ +#ifdef HAVE_SOLID /* Solid Server */ #define ODBC_TYPE "Solid" #include <cli0core.h> #include <cli0ext1.h> -#define HAVE_SQL_EXTENDED_FETCH 0 +#undef HAVE_SQL_EXTENDED_FETCH PHP_FUNCTION(solid_fetch_prev); +#define SQLSMALLINT SWORD +#define SQLUSMALLINT UWORD -#elif HAVE_EMPRESS /* Empress */ +#elif defined(HAVE_EMPRESS) /* Empress */ #define ODBC_TYPE "Empress" #include <sql.h> #include <sqlext.h> -#define HAVE_SQL_EXTENDED_FETCH 0 +#undef HAVE_SQL_EXTENDED_FETCH -#elif HAVE_ADABAS /* Adabas D */ +#elif defined(HAVE_ADABAS) /* Adabas D */ #define ODBC_TYPE "Adabas D" #include <WINDOWS.H> @@ -68,7 +70,7 @@ #include <sqlext.h> #define HAVE_SQL_EXTENDED_FETCH 1 -#elif HAVE_IODBC /* iODBC library */ +#elif defined(HAVE_IODBC) /* iODBC library */ #define ODBC_TYPE "iODBC" #include <isql.h> @@ -81,21 +83,21 @@ #define SQL_LEN_DATA_AT_EXEC_OFFSET (-100) #define SQL_LEN_DATA_AT_EXEC(length) (-(length)+SQL_LEN_DATA_AT_EXEC_OFFSET) -#elif HAVE_UNIXODBC /* unixODBC library */ +#elif defined(HAVE_UNIXODBC) /* unixODBC library */ #define ODBC_TYPE "unixODBC" #include <sql.h> #include <sqlext.h> #define HAVE_SQL_EXTENDED_FETCH 1 -#elif HAVE_ESOOB /* Easysoft ODBC-ODBC Bridge library */ +#elif defined(HAVE_ESOOB) /* Easysoft ODBC-ODBC Bridge library */ #define ODBC_TYPE "ESOOB" #include <sql.h> #include <sqlext.h> #define HAVE_SQL_EXTENDED_FETCH 1 -#elif HAVE_OPENLINK /* OpenLink ODBC drivers */ +#elif defined(HAVE_OPENLINK) /* OpenLink ODBC drivers */ #define ODBC_TYPE "Openlink" #include <iodbc.h> @@ -103,8 +105,10 @@ #include <isqlext.h> #include <udbcext.h> #define HAVE_SQL_EXTENDED_FETCH 1 +#define SQLSMALLINT SWORD +#define SQLUSMALLINT UWORD -#elif HAVE_VELOCIS /* Raima Velocis */ +#elif defined(HAVE_VELOCIS) /* Raima Velocis */ #define ODBC_TYPE "Velocis" #define UNIX @@ -112,13 +116,13 @@ #include <sql.h> #include <sqlext.h> -#elif HAVE_CODBC /* Custom ODBC */ +#elif defined(HAVE_CODBC) /* Custom ODBC */ #define ODBC_TYPE "Custom ODBC" #define HAVE_SQL_EXTENDED_FETCH 1 #include <odbc.h> -#elif HAVE_IBMDB2 /* DB2 CLI */ +#elif defined(HAVE_IBMDB2) /* DB2 CLI */ #define ODBC_TYPE "IBM DB2 CLI" #define HAVE_SQL_EXTENDED_FETCH 1 Index: php4/ext/odbc/velocis.c diff -u php4/ext/odbc/velocis.c:1.7 php4/ext/odbc/velocis.c:1.8 --- php4/ext/odbc/velocis.c:1.7 Sun Sep 5 09:01:42 1999 +++ php4/ext/odbc/velocis.c Tue Nov 9 09:28:59 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: velocis.c,v 1.7 1999/09/05 13:01:42 kara Exp $ */ +/* $Id: velocis.c,v 1.8 1999/11/09 14:28:59 ssb Exp $ */ /* * TODO: @@ -40,7 +40,7 @@ # define THREAD_LS #endif -#if HAVE_VELOCIS +#ifdef HAVE_VELOCIS #include "php3_velocis.h" function_entry velocis_functions[] = {