summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-09-13 10:43:51 +0200
committerFerenc Kovacs <tyra3l@gmail.com>2016-09-15 10:04:59 +0200
commitaef76591d7f121a0ceabdd67faeb0deb477c3c4f (patch)
tree4eaa0bc764fe9d50603560c536ac0b6a161959dd
parentb4edc331997b2dbc6bf5da9af4aeffd78306ffb9 (diff)
downloadphp-git-aef76591d7f121a0ceabdd67faeb0deb477c3c4f.tar.gz
fix C89 conformity
-rw-r--r--Zend/zend_API.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 3e191b63eb..dce30da81a 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -655,7 +655,7 @@ END_EXTERN_C()
#define RETURN_ZVAL_FAST(z) { RETVAL_ZVAL_FAST(z); return; }
/* Check that returned string length fits int */
-#define RETVAL_STRINGL_CHECK(s, len, dup) \
+#define RETVAL_STRINGL_CHECK(s, len, dup) do { \
size_t __len = (len); \
if (UNEXPECTED(__len > INT_MAX)) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, "String too long, max is %d", INT_MAX); \
@@ -664,8 +664,8 @@ END_EXTERN_C()
} \
RETURN_FALSE; \
} \
- RETVAL_STRINGL((s), __len, (dup))
-
+ RETVAL_STRINGL((s), __len, (dup)) \
+} while (0)
#define SET_VAR_STRING(n, v) { \