Changeset 1027

Timestamp:

2012-07-22T08:57:08+02:00 (10 months ago)

Author:

moo

Message:

refactor: improve build, kill warning

Location:

trunk

Files:

• mod_coverager/xc_coverager.c (modified) (1 diff)
• mod_disassembler/xc_disassembler.c (modified) (1 diff)
• processor/processor.m4 (modified) (4 diffs)
• xcache.c (modified) (3 diffs)
• xcache.h (modified) (1 diff)
• xcache/xc_compatibility.h (modified) (1 diff)
• xcache/xc_lock.c (modified) (1 diff)
• xcache/xc_lock.h (modified) (2 diffs)

trunk/mod_coverager/xc_coverager.c

@@ -23 +23 @@
 
 #include "ext/standard/info.h"
+#include "zend_compile.h"
 
 typedef HashTable *coverager_t;

trunk/mod_disassembler/xc_disassembler.c

@@ -1 +1 @@
 #include "xc_disassembler.h"
 #include "xcache.h"
+#include "xcache/xc_ini.h"
 #include "xcache/xc_utils.h"
 #include "xcache/xc_sandbox.h"

trunk/processor/processor.m4

@@ -654 +654 @@
 #endif
             case ZEND_JMP:
+#ifdef ZEND_ENGINE_2
                 assert(Z_OP(src->op1).jmp_addr >= processor->active_op_array_src->opcodes && Z_OP(src->op1).jmp_addr - processor->active_op_array_src->opcodes < processor->active_op_array_src->last);
                 Z_OP(dst->op1).jmp_addr = processor->active_op_array_dst->opcodes + (Z_OP(src->op1).jmp_addr - processor->active_op_array_src->opcodes);
                 assert(Z_OP(dst->op1).jmp_addr >= processor->active_op_array_dst->opcodes && Z_OP(dst->op1).jmp_addr - processor->active_op_array_dst->opcodes < processor->active_op_array_dst->last);
+#endif
                 break;
 
@@ -669 +671 @@
             case ZEND_JMP_SET_VAR:
 #endif
+#ifdef ZEND_ENGINE_2
                 assert(Z_OP(src->op2).jmp_addr >= processor->active_op_array_src->opcodes && Z_OP(src->op2).jmp_addr - processor->active_op_array_src->opcodes < processor->active_op_array_src->last);
                 Z_OP(dst->op2).jmp_addr = processor->active_op_array_dst->opcodes + (Z_OP(src->op2).jmp_addr - processor->active_op_array_src->opcodes);
                 assert(Z_OP(dst->op2).jmp_addr >= processor->active_op_array_dst->opcodes && Z_OP(dst->op2).jmp_addr - processor->active_op_array_dst->opcodes < processor->active_op_array_dst->last);
+#endif
                 break;
 
@@ -753 +757 @@
 #endif
                     case ZEND_JMP:
+#ifdef ZEND_ENGINE_2
                         Z_OP(opline->op1).jmp_addr = &dst->opcodes[Z_OP(opline->op1).jmp_addr - src->opcodes];
+#endif
                         break;
 
@@ -766 +772 @@
             case ZEND_JMP_SET_VAR:
 #endif
+#ifdef ZEND_ENGINE_2
                         Z_OP(opline->op2).jmp_addr = &dst->opcodes[Z_OP(opline->op2).jmp_addr - src->opcodes];
+#endif
                         break;
 

trunk/xcache.c

@@ -3132 +3132 @@
 /* {{{ proto bool xcache_get_isref(mixed variable)
    XCache internal uses only: Check if variable data is marked referenced */
+#ifdef ZEND_BEGIN_ARG_INFO_EX
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xcache_get_isref, 0, 0, 1)
     ZEND_ARG_INFO(1, variable)
 ZEND_END_ARG_INFO()
+#else
+static unsigned char arginfo_xcache_get_isref[] = { 1, BYREF_FORCE };
+#endif
 
 PHP_FUNCTION(xcache_get_isref)
@@ -3657 +3661 @@
     if (xc_php_size) {
         ptr = _php_math_number_format(xc_php_size, 0, '.', ',');
-        snprintf(buf, sizeof(buf), "enabled, %s bytes, %d split(s), with %d slots each", ptr, xc_php_hcache.size, xc_php_hentry.size);
+        snprintf(buf, sizeof(buf), "enabled, %s bytes, %lu split(s), with %lu slots each", ptr, xc_php_hcache.size, xc_php_hentry.size);
         php_info_print_table_row(2, "Opcode Cache", buf);
         efree(ptr);
@@ -3666 +3670 @@
     if (xc_var_size) {
         ptr = _php_math_number_format(xc_var_size, 0, '.', ',');
-        snprintf(buf, sizeof(buf), "enabled, %s bytes, %d split(s), with %d slots each", ptr, xc_var_hcache.size, xc_var_hentry.size);
+        snprintf(buf, sizeof(buf), "enabled, %s bytes, %lu split(s), with %lu slots each", ptr, xc_var_hcache.size, xc_var_hentry.size);
         php_info_print_table_row(2, "Variable Cache", buf);
         efree(ptr);

trunk/xcache.h

@@ -11 +11 @@
 
 #include <php.h>
-#include <zend_compile.h>
-#include <zend_API.h>
-#include <zend.h>
-#include "php_ini.h"
-#include "zend_hash.h"
 
 #ifdef HAVE_CONFIG_H

trunk/xcache/xc_compatibility.h

@@ -233 +233 @@
 
 #ifndef PHP_FE_END
-#   define PHP_FE_END {NULL, NULL, NULL}
+#   ifdef ZEND_ENGINE_2
+#       define PHP_FE_END {NULL, NULL, NULL, 0, 0}
+#   else
+#       define PHP_FE_END {NULL, NULL, NULL}
+#   endif
 #endif
 

trunk/xcache/xc_lock.c

@@ +1 @@
+#include "xc_lock.h"
+#include "xcache.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
-#include <php.h>
 #ifndef ZEND_WIN32
 typedef int HANDLE;

trunk/xcache/xc_lock.h

@@ +1 @@
+#ifndef XC_LOCK_H_1913F3DED68715D7CDA5A055E79FE0FF
+#define XC_LOCK_H_1913F3DED68715D7CDA5A055E79FE0FF
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
 typedef struct _xc_lock_t xc_lock_t;
 
@@ -10 +17 @@
 #define xc_lock(fd)         xc_fcntl_lock(fd)
 #define xc_unlock(fd)       xc_fcntl_unlock(fd)
+
+#endif /* XC_LOCK_H_1913F3DED68715D7CDA5A055E79FE0FF */