Fix for 5.4/5.5

diff --git a/phpdbg.h b/phpdbg.h
index a3835f3c06470353f4ba5abc6b5e4f714f6bab2c..3220243f2903f9823f0416c64f2cc91897d6973c 100644 (file)
--- a/phpdbg.h
+++ b/phpdbg.h
@@ -217,7 +217,7 @@ ZEND_BEGIN_MODULE_GLOBALS(phpdbg)
        HashTable registered;                        /* registered */
        HashTable seek;                              /* seek oplines */
        phpdbg_frame_t frame;                        /* frame */
-       uint32_t last_line;                          /* last executed line */
+       zend_uint last_line;                         /* last executed line */
 
        phpdbg_lexer_data lexer;                     /* lexer data */
        phpdbg_param_t *parser_stack;                /* param stack during lexer / parser phase */

diff --git a/phpdbg_bp.c b/phpdbg_bp.c
index fa9355cb243e4fc9c809aed4b3ebea472b0d1093..26e6ee297135f0d53ab8350b0b53576a3acf6b8e 100644 (file)
--- a/phpdbg_bp.c
+++ b/phpdbg_bp.c
@@ -696,7 +696,7 @@ PHPDBG_API void phpdbg_set_breakpoint_opline_ex(phpdbg_opline_ptr_t opline TSRML
 static inline void phpdbg_create_conditional_break(phpdbg_breakcond_t *brake, const phpdbg_param_t *param, const char *expr, size_t expr_len, zend_ulong hash TSRMLS_DC) /* {{{ */
 {
        phpdbg_breakcond_t new_break;
-       uint32_t cops = CG(compiler_options);
+       zend_uint cops = CG(compiler_options);
        zval pv;
 
        PHPDBG_BREAK_INIT(new_break, PHPDBG_BREAK_COND);
@@ -1075,7 +1075,7 @@ PHPDBG_API void phpdbg_delete_breakpoint(zend_ulong num TSRMLS_DC) /* {{{ */
 
        if ((brake = phpdbg_find_breakbase_ex(num, &table, &position TSRMLS_CC))) {
                char *key;
-               uint32_t klen;
+               zend_uint klen;
                zend_ulong idx;
                int type = brake->type;
                char *name = NULL;
@@ -1354,7 +1354,7 @@ PHPDBG_API void phpdbg_print_breakpoints(zend_ulong type TSRMLS_DC) /* {{{ */
                        HashPosition position[2];
                        HashTable *class_table;
                        char *class_name = NULL;
-                       uint32_t class_len = 0;
+                       zend_uint class_len = 0;
                        zend_ulong class_idx = 0L;
 
                        phpdbg_out(SEPARATE "\n");
@@ -1433,7 +1433,7 @@ PHPDBG_API void phpdbg_print_breakpoints(zend_ulong type TSRMLS_DC) /* {{{ */
                        HashPosition position[3];
                        HashTable *class_table, *method_table;
                        char *class_name = NULL, *method_name = NULL;
-                       uint32_t class_len = 0, method_len = 0;
+                       zend_uint class_len = 0, method_len = 0;
                        zend_ulong class_idx = 0L, method_idx = 0L;
 
                        phpdbg_out(SEPARATE "\n");
@@ -1472,7 +1472,7 @@ PHPDBG_API void phpdbg_print_breakpoints(zend_ulong type TSRMLS_DC) /* {{{ */
                        HashPosition position[2];
                        HashTable *function_table;
                        char *function_name = NULL;
-                       uint32_t function_len = 0;
+                       zend_uint function_len = 0;
                        zend_ulong function_idx = 0L;
 
                        phpdbg_out(SEPARATE "\n");
@@ -1502,7 +1502,7 @@ PHPDBG_API void phpdbg_print_breakpoints(zend_ulong type TSRMLS_DC) /* {{{ */
                        HashPosition position[2];
                        HashTable *file_table;
                        char *file_name = NULL;
-                       uint32_t file_len = 0;
+                       zend_uint file_len = 0;
                        zend_ulong file_idx = 0L;
 
                        phpdbg_out(SEPARATE "\n");

diff --git a/phpdbg_cmd.c b/phpdbg_cmd.c
index d42ad36495f74e16975877f553690ddc50542a42..a32114e916cf62cc4d97f398149f7732c3438373 100644 (file)
--- a/phpdbg_cmd.c
+++ b/phpdbg_cmd.c
@@ -691,7 +691,7 @@ PHPDBG_API const phpdbg_command_t *phpdbg_stack_resolve(const phpdbg_command_t *
 
                default: {
                        char *list = NULL;
-                       uint32_t it = 0;
+                       zend_uint it = 0;
                        size_t pos = 0;
 
                        while (it < matches) {

diff --git a/phpdbg_opcode.c b/phpdbg_opcode.c
index 413652164624fc51e5c9179595b67428b5445bab..331718accc2405d6297e9ef905fe19bd282ba66e 100644 (file)
--- a/phpdbg_opcode.c
+++ b/phpdbg_opcode.c
@@ -26,7 +26,7 @@
 
 ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
 
-static inline uint32_t phpdbg_decode_literal(zend_op_array *ops, zend_literal *literal TSRMLS_DC) /* {{{ */
+static inline zend_uint phpdbg_decode_literal(zend_op_array *ops, zend_literal *literal TSRMLS_DC) /* {{{ */
 {
        int iter = 0;
 
@@ -40,7 +40,7 @@ static inline uint32_t phpdbg_decode_literal(zend_op_array *ops, zend_literal *l
        return 0;
 } /* }}} */
 
-static inline char *phpdbg_decode_op(zend_op_array *ops, znode_op *op, uint32_t type, HashTable *vars TSRMLS_DC) /* {{{ */
+static inline char *phpdbg_decode_op(zend_op_array *ops, znode_op *op, zend_uint type, HashTable *vars TSRMLS_DC) /* {{{ */
 {
        char *decode = NULL;
 

diff --git a/phpdbg_print.c b/phpdbg_print.c
index 9a8edb3abaf2e7762f78bdb8f2607737cbdf876d..80eeddb39d111faca05b581c0dface029190f494 100644 (file)
--- a/phpdbg_print.c
+++ b/phpdbg_print.c
@@ -59,7 +59,7 @@ static inline void phpdbg_print_function_helper(zend_function *method TSRMLS_DC)
 
                        if (op_array) {
                                zend_op *opline = &(op_array->opcodes[0]);
-                               uint32_t opcode = 0,
+                               zend_uint opcode = 0,
                                end = op_array->last-1;
 
                                if (method->common.scope) {

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 64f43cb204332ea1155247e5b6f7c1801a764b3b..194c890ebe6b15163ae5851f9b6119f023624300 100644 (file)
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -441,7 +441,7 @@ PHPDBG_COMMAND(until) /* {{{ */
 
        PHPDBG_G(flags) |= PHPDBG_IN_UNTIL;
        {
-               uint32_t next = 0, self = (EG(current_execute_data)->opline - EG(active_op_array)->opcodes);
+               zend_uint next = 0, self = (EG(current_execute_data)->opline - EG(active_op_array)->opcodes);
                zend_op  *opline = &EG(active_op_array)->opcodes[self];
 
                for (next = self; next < EG(active_op_array)->last; next++) {
@@ -464,7 +464,7 @@ PHPDBG_COMMAND(finish) /* {{{ */
 
        PHPDBG_G(flags) |= PHPDBG_IN_FINISH;
        {
-               uint32_t next = 0, self = (EG(current_execute_data)->opline - EG(active_op_array)->opcodes);
+               zend_uint next = 0, self = (EG(current_execute_data)->opline - EG(active_op_array)->opcodes);
 
                for (next = self; next < EG(active_op_array)->last; next++) {
                        switch (EG(active_op_array)->opcodes[next].opcode) {
@@ -492,7 +492,7 @@ PHPDBG_COMMAND(leave) /* {{{ */
 
        PHPDBG_G(flags) |= PHPDBG_IN_LEAVE;
        {
-               uint32_t next = 0, self = (EG(current_execute_data)->opline - EG(active_op_array)->opcodes);
+               zend_uint next = 0, self = (EG(current_execute_data)->opline - EG(active_op_array)->opcodes);
 
                for (next = self; next < EG(active_op_array)->last; next++) {
                        switch (EG(active_op_array)->opcodes[next].opcode) {
@@ -530,7 +530,7 @@ static inline void phpdbg_handle_exception(TSRMLS_D) /* }}} */
 
        /* get filename and linenumber before unsetting exception */
        const char *filename = zend_get_executed_filename(TSRMLS_C);
-       uint32_t lineno = zend_get_executed_lineno(TSRMLS_C);
+       zend_uint lineno = zend_get_executed_lineno(TSRMLS_C);
 
        /* copy exception */
        exception = *EG(exception);