diff options
Diffstat (limited to 'sapi/phpdbg/phpdbg.h')
| -rw-r--r-- | sapi/phpdbg/phpdbg.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h index 72501bffb4..d0e316c78b 100644 --- a/sapi/phpdbg/phpdbg.h +++ b/sapi/phpdbg/phpdbg.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) 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 | @@ -46,7 +46,7 @@ #include "zend_ini_scanner.h" #include "zend_stream.h" #include "zend_signal.h" -#if !defined(_WIN32) && !defined(ZEND_SIGNALS) && defined(HAVE_SIGNAL_H) +#if !defined(_WIN32) && !defined(ZEND_SIGNALS) # include <signal.h> #elif defined(PHP_WIN32) # include "win32/signal.h" @@ -106,7 +106,7 @@ #define PHPDBG_NAME "phpdbg" #define PHPDBG_AUTHORS "Felipe Pena, Joe Watkins and Bob Weinand" /* Ordered by last name */ #define PHPDBG_ISSUES "http://bugs.php.net/report.php" -#define PHPDBG_VERSION "0.5.0" +#define PHPDBG_VERSION PHP_VERSION #define PHPDBG_INIT_FILENAME ".phpdbginit" #define PHPDBG_DEFAULT_PROMPT "prompt>" /* }}} */ @@ -121,7 +121,7 @@ #if !defined(PHPDBG_WEBDATA_TRANSFER_H) && !defined(PHPDBG_WEBHELPER_H) #ifdef ZTS -# define PHPDBG_G(v) TSRMG(phpdbg_globals_id, zend_phpdbg_globals *, v) +# define PHPDBG_G(v) ZEND_TSRMG(phpdbg_globals_id, zend_phpdbg_globals *, v) #else # define PHPDBG_G(v) (phpdbg_globals.v) #endif @@ -290,7 +290,7 @@ ZEND_BEGIN_MODULE_GLOBALS(phpdbg) int fd; } io[PHPDBG_IO_FDS]; /* io */ int eol; /* type of line ending to use */ - size_t (*php_stdiop_write)(php_stream *, const char *, size_t); + ssize_t (*php_stdiop_write)(php_stream *, const char *, size_t); int in_script_xml; /* in <stream> output mode */ struct { zend_bool active; |