CVS update: php3/functions
| From: | shane | Date: | Thu, 18 Feb 1999 17:48:54 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-4148@lists.php.net to get a copy of this message | ||
Date: Thursday February 18, 1999 @ 12:48
Author: shane
Update of /repository/php3/functions
In directory asf:/u/temp/cvs-serv1222/functions
Modified Files:
oracle.c unified_odbc.c
Log Message:
fixup to get all compiling under win32
Index: php3/functions/oracle.c
diff -c php3/functions/oracle.c:1.93 php3/functions/oracle.c:1.94
*** php3/functions/oracle.c:1.93 Fri Jan 8 07:47:07 1999
--- php3/functions/oracle.c Thu Feb 18 12:48:52 1999
***************
*** 30,36 ****
+----------------------------------------------------------------------+
*/
! /* $Id: oracle.c,v 1.93 1999/01/08 12:47:07 thies Exp $ */
#if defined(COMPILE_DL)
# if PHP_31
--- 30,36 ----
+----------------------------------------------------------------------+
*/
! /* $Id: oracle.c,v 1.94 1999/02/18 17:48:52 shane Exp $ */
#if defined(COMPILE_DL)
# if PHP_31
***************
*** 48,55 ****
#if HAVE_ORACLE
#include "php3_list.h"
! #if !(WIN32|WINNT)
! #include "build-defs.h"
#endif
#include "snprintf.h"
--- 48,57 ----
#if HAVE_ORACLE
#include "php3_list.h"
! #ifdef WIN32
! # include "variables.h"
! #else
! # include "build-defs.h"
#endif
#include "snprintf.h"
***************
*** 1660,1668 ****
return 1;
}
- /* see oracle_hack.c */
- extern PHPAPI HashTable *php3i_get_symbol_table(void);
-
int ora_set_param_values(oraCursor *cursor, int isout)
{
char *paramname;
--- 1662,1667 ----
***************
*** 1670,1676 ****
pval *pdata;
int i, len;
#if (WIN32|WINNT)
! /* see oracle_hack.c */
HashTable *symbol_table=php3i_get_symbol_table();
#endif
_php3_hash_internal_pointer_reset(cursor->params);
--- 1669,1675 ----
pval *pdata;
int i, len;
#if (WIN32|WINNT)
! /* see variables.c */
HashTable *symbol_table=php3i_get_symbol_table();
#endif
_php3_hash_internal_pointer_reset(cursor->params);
Index: php3/functions/unified_odbc.c
diff -c php3/functions/unified_odbc.c:1.102 php3/functions/unified_odbc.c:1.103
*** php3/functions/unified_odbc.c:1.102 Fri Feb 5 06:13:26 1999
--- php3/functions/unified_odbc.c Thu Feb 18 12:48:53 1999
***************
*** 29,35 ****
+----------------------------------------------------------------------+
*/
! /* $Id: unified_odbc.c,v 1.102 1999/02/05 11:13:26 kara Exp $ */
/* This file is based on the Adabas D extension.
* Adabas D will no longer be supported as separate module.
--- 29,35 ----
+----------------------------------------------------------------------+
*/
! /* $Id: unified_odbc.c,v 1.103 1999/02/18 17:48:53 shane Exp $ */
/* This file is based on the Adabas D extension.
* Adabas D will no longer be supported as separate module.
***************
*** 1698,1704 ****
char *hashed_details;
int hashed_len, len, id, cur_opt;
int type;
- char tmp[5];
UODBC_TLS_VARS;
UODBC_GLOBAL(PHP3_UODBC_MODULE).resource_list = list;
--- 1698,1703 ----
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net