Changeset 770

Timestamp:

2011-04-18T10:11:59+02:00 (2 years ago)

Author:

moo

Message:

fixed #236: kill gcc false warning

Location:

trunk

Files:

• processor/head.m4 (modified) (2 diffs)
• xcache.h (modified) (2 diffs)

trunk/processor/head.m4

@@ -141 +141 @@
 #define C_RELAYLINE , __LINE__
 ')
-static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, const zstr const str, long size IFASSERT(`, int relayline')) {
+static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, const_zstr const str, long size IFASSERT(`, int relayline')) {
     pushdef(`__LINE__', `relayline')
     int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size);
@@ -163 +163 @@
 /* {{{ xc_store_string_n */
 REDEF(`KIND', `store')
-static inline zstr xc_store_string_n(xc_processor_t *processor, zend_uchar type, const zstr const str, long size IFASSERT(`, int relayline')) {
+static inline zstr xc_store_string_n(xc_processor_t *processor, zend_uchar type, const_zstr const str, long size IFASSERT(`, int relayline')) {
     pushdef(`__LINE__', `relayline')
     int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size);

trunk/xcache.h

@@ -138 +138 @@
 #ifndef IS_UNICODE
 typedef char *zstr;
+typedef const char *const_zstr;
 #   define ZSTR_S(s)     (s)
 #   define ZSTR_U(s)     (s)
@@ -145 +146 @@
 #   define ZSTR_PV(s)    (s)
 #else
+typedef const zstr const_zstr;
 #   define ZSTR_S(zs)    ((zs).s)
 #   define ZSTR_U(zs)    ((zs).u)