com php-src: fix broken master merge: Zend/zend_exceptions. h
| From: | Anatol Belski | Date: | Wed, 16 Oct 2013 13:10:00 +0000 |
| Subject: | com php-src: fix broken master merge: Zend/zend_exceptions. h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73441@lists.php.net to get a copy of this message | ||
Commit: 4a5fee1b369aab66e8ace489618c582ba7b1d6b1
Author: Anatol Belski <ab@php.net> Wed, 16 Oct 2013 06:10:00 -0700
Parents: 4b6d78496253f5bae7bbcf221d8fb2c1342bdafd
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4a5fee1b369aab66e8ace489618c582ba7b1d6b1
Log:
fix broken master merge
Changed paths:
M Zend/zend_exceptions.h
Diff:
diff --git a/Zend/zend_exceptions.h b/Zend/zend_exceptions.h
index 67eed24..b135131 100644
--- a/Zend/zend_exceptions.h
+++ b/Zend/zend_exceptions.h
@@ -54,7 +54,7 @@ ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC);
/* do not export, in php it's available thru spprintf directly */
zend_str_size_int zend_spprintf(char **message, zend_str_size_int max_len, const char *format,
...);
-=======
+
END_EXTERN_C()
#endif