diff options
| author | Aaron Piotrowski <aaron@trowski.com> | 2016-06-10 22:02:23 -0500 |
|---|---|---|
| committer | Aaron Piotrowski <aaron@trowski.com> | 2016-06-10 22:02:23 -0500 |
| commit | e3c681aa5cc71122a8d2fae42e6513fc413ccac8 (patch) | |
| tree | 5f1df62f7b666028edb0ee1adf083a52d63df45a /ext/readline/php_readline.h | |
| parent | fb4e3085cbaa76eb8f28eebf848a81d1c0190067 (diff) | |
| parent | 792e89385ca6fc722a03590722eb7745a2374720 (diff) | |
| download | php-git-e3c681aa5cc71122a8d2fae42e6513fc413ccac8.tar.gz | |
Merge branch 'master' into throw-error-in-extensions
Diffstat (limited to 'ext/readline/php_readline.h')
| -rw-r--r-- | ext/readline/php_readline.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/readline/php_readline.h b/ext/readline/php_readline.h index dac79f04e7..e3a0aba676 100644 --- a/ext/readline/php_readline.h +++ b/ext/readline/php_readline.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -22,9 +22,11 @@ #define PHP_READLINE_H #if HAVE_LIBREADLINE || HAVE_LIBEDIT +#ifndef PHP_WIN32 #ifdef ZTS #warning Readline module will *NEVER* be thread-safe #endif +#endif extern zend_module_entry readline_module_entry; #define phpext_readline_ptr &readline_module_entry |