Skip to content

Commit ec31924

Browse files
committed
Constify to void build warning for C++ ext. [-Wwrite-strings]
Example (with v8js): /builddir/build/BUILD/php-pecl-v8js-1.3.4/NTS/v8js_class.cc: In function 'void v8js_execute_script(zval*, v8js_script*, long int, long int, long int, zval**)': /usr/include/php/Zend/zend.h:204:57: warning: ISO C++ forbids converting a string constant to 'char*' [-Wwrite-strings] #define zend_bailout() _zend_bailout(__FILE__, __LINE__) ^ /builddir/build/BUILD/php-pecl-v8js-1.3.4/NTS/v8js_class.cc:633:3: note: in expansion of macro 'zend_bailout' zend_bailout(); ^~~~~~~~~~~~
1 parent 9ad8e8f commit ec31924

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Zend/zend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ ZEND_COLD void zenderror(const char *error) /* {{{ */
983983
/* }}} */
984984

985985
BEGIN_EXTERN_C()
986-
ZEND_API ZEND_COLD void _zend_bailout(char *filename, uint32_t lineno) /* {{{ */
986+
ZEND_API ZEND_COLD void _zend_bailout(const char *filename, uint32_t lineno) /* {{{ */
987987
{
988988

989989
if (!EG(bailout)) {

Zend/zend.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ void zend_register_standard_ini_entries(void);
225225
void zend_post_startup(void);
226226
void zend_set_utility_values(zend_utility_values *utility_values);
227227

228-
ZEND_API ZEND_COLD void _zend_bailout(char *filename, uint32_t lineno);
228+
ZEND_API ZEND_COLD void _zend_bailout(const char *filename, uint32_t lineno);
229229

230230
ZEND_API size_t zend_vspprintf(char **pbuf, size_t max_len, const char *format, va_list ap);
231231
ZEND_API size_t zend_spprintf(char **message, size_t max_len, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 3, 4);

0 commit comments

Comments
 (0)