diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
| commit | db72160e5ac2b267b9ffa23ad84e62e609382a44 (patch) | |
| tree | 6e50c2826f98308d500cc826934a503751d4d566 /win32/winutil.h | |
| parent | be88d0e5d4ab5fdf775f3e38cf054aa0451f0d36 (diff) | |
| parent | f469dc7429f2257aac6f46228302408608fbd62f (diff) | |
| download | php-git-db72160e5ac2b267b9ffa23ad84e62e609382a44.tar.gz | |
Merge branch 'master' into integer_semantics
Conflicts:
Zend/zend_operators.h
Diffstat (limited to 'win32/winutil.h')
| -rw-r--r-- | win32/winutil.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/winutil.h b/win32/winutil.h index 773063e5f6..e0193d33f3 100644 --- a/win32/winutil.h +++ b/win32/winutil.h @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -PHPAPI char *php_win32_error_to_msg(int error); +PHPAPI char *php_win32_error_to_msg(HRESULT error); #define php_win_err() php_win32_error_to_msg(GetLastError()) int php_win32_check_trailing_space(const char * path, const int path_len); |