summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-07-15 15:50:42 +0400
committerDmitry Stogov <dmitry@zend.com>2014-07-15 15:50:42 +0400
commitb4c2bd227743e4ab9d47bf624911b230b3237b51 (patch)
tree2fc9d41f122c01bbc397128fd8bd65bf5c2e12bf /win32
parentbcc677789c1832916af77994059873a30d145a72 (diff)
downloadphp-git-b4c2bd227743e4ab9d47bf624911b230b3237b51.tar.gz
Fixed compilation on Windows
Diffstat (limited to 'win32')
-rw-r--r--win32/registry.c3
-rw-r--r--win32/sendmail.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/win32/registry.c b/win32/registry.c
index e7d1b2b2a9..ade09aa486 100644
--- a/win32/registry.c
+++ b/win32/registry.c
@@ -146,8 +146,9 @@ static int LoadDirectory(HashTable *directories, HKEY key, char *path, int path_
return ret;
}
-static void delete_internal_hashtable(void *data)
+static void delete_internal_hashtable(zval *zv)
{
+ void *data = Z_PTR_P(zv);
zend_hash_destroy(*(HashTable**)data);
free(*(HashTable**)data);
}
diff --git a/win32/sendmail.c b/win32/sendmail.c
index dd653879c2..ed9736c1dd 100644
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -616,8 +616,8 @@ static int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char
return (res);
}
-PHPAPI zend_string *php_str_to_str(char *haystack, int length, char *needle,
- int needle_len, char *str, int str_len);
+//???PHPAPI zend_string *php_str_to_str(char *haystack, int length, char *needle,
+//??? int needle_len, char *str, int str_len);
/* Escape \n. sequences
* We use php_str_to_str() and not php_str_replace_in_subject(), since the latter