Changeset 860 for trunk/utils.c

Timestamp:

2012-03-29T04:54:33+02:00 (15 months ago)

Author:

moo

Message:

kill warnings

File:

• trunk/utils.c (modified) (6 diffs)

trunk/utils.c

@@ -482 +482 @@
 
 #ifdef HAVE_XCACHE_CONSTANT
-void xc_install_constant(ZEND_24(const) char *filename, zend_constant *constant, zend_uchar type, const24_zstr key, uint len, ulong h TSRMLS_DC) /* {{{ */
+void xc_install_constant(ZEND_24(NOTHING, const) char *filename, zend_constant *constant, zend_uchar type, const24_zstr key, uint len, ulong h TSRMLS_DC) /* {{{ */
 {
     if (zend_u_hash_add(EG(zend_constants), type, key, len,
@@ -502 +502 @@
 /* }}} */
 #endif
-void xc_install_function(ZEND_24(const) char *filename, zend_function *func, zend_uchar type, const24_zstr key, uint len, ulong h TSRMLS_DC) /* {{{ */
+void xc_install_function(ZEND_24(NOTHING, const) char *filename, zend_function *func, zend_uchar type, const24_zstr key, uint len, ulong h TSRMLS_DC) /* {{{ */
 {
     zend_bool istmpkey;
@@ -532 +532 @@
 }
 /* }}} */
-ZESW(xc_cest_t *, void) xc_install_class(ZEND_24(const) char *filename, xc_cest_t *cest, int oplineno, zend_uchar type, const24_zstr key, uint len, ulong h TSRMLS_DC) /* {{{ */
+ZESW(xc_cest_t *, void) xc_install_class(ZEND_24(NOTHING, const) char *filename, xc_cest_t *cest, int oplineno, zend_uchar type, const24_zstr key, uint len, ulong h TSRMLS_DC) /* {{{ */
 {
     zend_bool istmpkey;
@@ -630 +630 @@
 #endif
 #ifdef ZEND_ENGINE_2_1
-static zend_bool xc_auto_global_callback(ZEND_24(const) char *name, uint name_len TSRMLS_DC) /* {{{ */
+static zend_bool xc_auto_global_callback(ZEND_24(NOTHING, const) char *name, uint name_len TSRMLS_DC) /* {{{ */
 {
     return 0;
@@ -710 +710 @@
 /* }}} */
 #endif
-xc_sandbox_t *xc_sandbox_init(xc_sandbox_t *sandbox, ZEND_24(const) char *filename TSRMLS_DC) /* {{{ */
+xc_sandbox_t *xc_sandbox_init(xc_sandbox_t *sandbox, ZEND_24(NOTHING, const) char *filename TSRMLS_DC) /* {{{ */
 {
     HashTable *h;
@@ -905 +905 @@
     if (install != XC_NoInstall) {
         CG(in_compilation)    = 1;
-        CG(compiled_filename) = ZEND_24((char *)) sandbox->filename;
+        CG(compiled_filename) = ZEND_24(NOTHING, (char *)) sandbox->filename;
         CG(zend_lineno)       = 0;
         xc_sandbox_install(sandbox, install TSRMLS_CC);