summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-07-16 18:05:24 +0000
committerSascha Schumann <sas@php.net>1999-07-16 18:05:24 +0000
commit68b0f0b41865632749018a265706aeda46e2fe9b (patch)
tree31bdcacf067d1998eaa6b979ee1d511df516432c
parent1671424a5f655fbf431c7672f36f25d85880e337 (diff)
downloadphp-git-68b0f0b41865632749018a265706aeda46e2fe9b.tar.gz
This is so ugly, I hate myself for committing it
-rw-r--r--ext/msql/msql.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/ext/msql/msql.c b/ext/msql/msql.c
index 04d79abbb3..8781ee4062 100644
--- a/ext/msql/msql.c
+++ b/ext/msql/msql.c
@@ -29,6 +29,8 @@
#if HAVE_MSQL
+#define OS_UNIX 1
+
#if defined(WIN32) && defined(MSQL1)
#include <msql1.h>
#else
@@ -448,11 +450,7 @@ static int php3_msql_get_default_link(INTERNAL_FUNCTION_PARAMETERS)
{
MSQL_TLS_VARS;
if (MSQL_GLOBAL(php3_msql_module).default_link==-1) { /* no link opened yet, implicitly open one */
- HashTable tmp;
-
- _php3_hash_init(&tmp,0,NULL,NULL,0);
- php3_msql_do_connect(&tmp,return_value,list,plist,0);
- _php3_hash_destroy(&tmp);
+ php3_msql_do_connect(0, return_value, list, plist, this_ptr,0);
}
return MSQL_GLOBAL(php3_msql_module).default_link;
}
@@ -1028,7 +1026,6 @@ static void php3_msql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
int type;
int num_fields;
int i;
- pval *pval_ptr;
PLS_FETCH();
MSQL_TLS_VARS;