diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
| commit | c2b90805e81de43b4fa28fa1b30ed255bfba76b2 (patch) | |
| tree | a353bb7b1cb958fd4f3e576ab44f3b6ef03a02c2 /ext/shmop/php_shmop.h | |
| parent | b44cf1a8540d321583a0d83ebca688ebab10d3b0 (diff) | |
| parent | d0e84c6f4702dc5dda473851dd33c5e6cee82ee6 (diff) | |
| download | php-git-c2b90805e81de43b4fa28fa1b30ed255bfba76b2.tar.gz | |
Merge branch 'master' into openssl_error_store
Diffstat (limited to 'ext/shmop/php_shmop.h')
| -rw-r--r-- | ext/shmop/php_shmop.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/shmop/php_shmop.h b/ext/shmop/php_shmop.h index ca7f703c9a..b5cfd3b3c2 100644 --- a/ext/shmop/php_shmop.h +++ b/ext/shmop/php_shmop.h @@ -38,7 +38,7 @@ PHP_FUNCTION(shmop_write); PHP_FUNCTION(shmop_delete); #ifdef PHP_WIN32 -typedef int key_t; +# include "win32/ipc.h" #endif struct php_shmop |