CVS update: php3/functions
| From: | shane | Date: | Sun, 04 Oct 1998 20:27:00 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1660@lists.php.net to get a copy of this message | ||
Date: Sunday October 4, 1998 @ 16:27
Author: shane
Update of /repository/php3/functions
In directory asf:/u2/tmp/cvs-serv3870/functions
Modified Files:
oracle.c
Log Message:
Typo caused oracle to not compile right on windows before.
Now found a problem with code that has to be addressed before oracle will
work right as a dll on windows. See FIXME in code.
Index: php3/functions/oracle.c
diff -c php3/functions/oracle.c:1.80 php3/functions/oracle.c:1.81
*** php3/functions/oracle.c:1.80 Thu Sep 10 19:57:20 1998
--- php3/functions/oracle.c Sun Oct 4 16:27:00 1998
***************
*** 29,42 ****
| Andreas Karajannis <Andreas.Karajannis@gmd.de> |
+----------------------------------------------------------------------+
*/
#include "php.h"
#include "internal_functions.h"
#include "oracle.h"
#if HAVE_ORACLE
-
#include "php3_list.h"
#include "build-defs.h"
#include "snprintf.h"
#ifndef min
--- 29,46 ----
| Andreas Karajannis <Andreas.Karajannis@gmd.de> |
+----------------------------------------------------------------------+
*/
+ #if defined(COMPILE_DL)
+ #include "dl/phpdl.h"
+ #endif
#include "php.h"
#include "internal_functions.h"
#include "oracle.h"
#if HAVE_ORACLE
#include "php3_list.h"
+ #if !(WIN32|WINNT)
#include "build-defs.h"
+ #endif
#include "snprintf.h"
#ifndef min
***************
*** 812,818 ****
paramptr->progvl = argv[3]->value.lval + 1;
if(argc > 4){
convert_to_long(argv[4]);
! paramptr->type = argv[4]->value.lval;
}else{
paramptr->type = 0;
}
--- 816,822 ----
paramptr->progvl = argv[3]->value.lval + 1;
if(argc > 4){
convert_to_long(argv[4]);
! paramptr->type = (short)argv[4]->value.lval;
}else{
paramptr->type = 0;
}
***************
*** 1387,1396 ****
--- 1391,1402 ----
void php3_info_oracle()
{
+ #if !(WIN32|WINNT)
php3_printf("Oracle version: %s<br>\n"
"Compile-time ORACLE_HOME: %s<br>\n"
"Libraries used: %s",
PHP_ORACLE_VERSION, PHP_ORACLE_HOME, PHP_ORACLE_LIBS);
+ #endif
}
***************
*** 1603,1609 ****
efree(paramname);
continue;
}
!
if(_php3_hash_find(&GLOBAL(symbol_table), paramname, strlen(paramname) + 1, (void
**)&pdata) == FAILURE){
php3_error(E_WARNING, "Can't find variable for parameter");
efree(paramname);
--- 1609,1617 ----
efree(paramname);
continue;
}
!
! /* FIXME Globals don't work in extensions on windows, have to do something
! else here */
if(_php3_hash_find(&GLOBAL(symbol_table), paramname, strlen(paramname) + 1, (void
**)&pdata) == FAILURE){
php3_error(E_WARNING, "Can't find variable for parameter");
efree(paramname);
--
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