summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2010-11-25 23:06:12 (GMT)
committerPierre Joye <pajoye@php.net>2010-11-25 23:06:12 (GMT)
commit4574844c52cdb4cf2d6c6f35925b2171f2d1887b (patch)
tree9296db2f63e26bd232b4f55cc80f6757272a96be /win32
parent8f85ff3dd67fbe256b9c7fc7e8bbcd73bdf5e054 (diff)
downloadphp-4574844c52cdb4cf2d6c6f35925b2171f2d1887b.tar.gz
- cleanup broken double definition of php_win_err and rename it while being there
Diffstat (limited to 'win32')
-rw-r--r--win32/winutil.c3
-rw-r--r--win32/winutil.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/win32/winutil.c b/win32/winutil.c
index ce4f1ba..f82478b7 100644
--- a/win32/winutil.c
+++ b/win32/winutil.c
@@ -22,7 +22,7 @@
#include "php.h"
#include <wincrypt.h>
-PHPAPI char *php_win_err(int error)
+PHPAPI char *php_win32_error_to_msg(int error)
{
char *buf = NULL;
@@ -75,3 +75,4 @@ PHPAPI int php_win32_get_random_bytes(unsigned char *buf, size_t size) { /* {{{
return FAILURE;
}
/* }}} */
+
diff --git a/win32/winutil.h b/win32/winutil.h
index 5f8efe0..bb72696 100644
--- a/win32/winutil.h
+++ b/win32/winutil.h
@@ -16,8 +16,8 @@
+----------------------------------------------------------------------+
*/
-PHPAPI char *php_win_err(int error);
+PHPAPI char *php_win32_error_to_msg(int error);
-#define php_win_err() php_win_err(GetLastError())
+#define php_win_err() php_win32_error_to_msg(GetLastError())
int php_win32_check_trailing_space(const char * path, const int path_len);
PHPAPI php_win32_get_random_bytes(unsigned char *buf, size_t size);