diff options
| author | Anatol Belski <ab@php.net> | 2013-12-23 12:00:49 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-12-23 12:00:49 +0100 |
| commit | 3f7a145b5abd66d1c77e65060d15702db4d36529 (patch) | |
| tree | d98c27d913523a3b4959ea439746906941330dcf | |
| parent | f7b6db7555db9379547a1c9ead4051de1ffc8566 (diff) | |
| parent | f156e684ac290f4ec69564f653d3167cdb5c62be (diff) | |
| download | php-git-3f7a145b5abd66d1c77e65060d15702db4d36529.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
removed outdated IsDebuggerPresent declaration
| -rw-r--r-- | Zend/zend.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 11baf34c93..80037e5c16 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -43,10 +43,6 @@ # define GLOBAL_CONSTANTS_TABLE EG(zend_constants) #endif -#if defined(ZEND_WIN32) && ZEND_DEBUG -BOOL WINAPI IsDebuggerPresent(VOID); -#endif - /* true multithread-shared globals */ ZEND_API zend_class_entry *zend_standard_class_def = NULL; ZEND_API int (*zend_printf)(const char *format, ...); |