diff options
| author | Anatol Belski <ab@php.net> | 2016-08-18 15:31:36 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-08-18 15:31:36 +0200 |
| commit | 61bc6618b7bd3850d683e65bf2690e0c08c8387b (patch) | |
| tree | 973c255a44652ddf326148b5ea24abd3d4e8ba4d /TSRM/tsrm_win32.c | |
| parent | 634b382e47dc53134a519b6a47c07e5c2f1f15cc (diff) | |
| parent | 20aae1caa3c4301d0055f8e40729e57384ae2cea (diff) | |
| download | php-git-61bc6618b7bd3850d683e65bf2690e0c08c8387b.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
map ell the err code
Diffstat (limited to 'TSRM/tsrm_win32.c')
| -rw-r--r-- | TSRM/tsrm_win32.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index 958ff80ac3..6bf826e6fa 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -730,10 +730,7 @@ TSRM_API void *shmat(int key, const void *shmaddr, int flags) err = GetLastError(); if (err) { - /* Catch more errors */ - if (ERROR_NOT_ENOUGH_MEMORY == err) { - _set_errno(ENOMEM); - } + SET_ERRNO_FROM_WIN32_CODE(err); return (void*)-1; } |