Merge branch 'master' of github.com:krakjoe/phpdbg

diff --cc phpdbg_list.c
Simple merge

diff --cc phpdbg_prompt.c
index 37cdfe9df77d7cc0147209d6cbdfbfa163ffae28,a800e46247ad1bfee366f6ed1572fc7e99194725..aaba7971f54e221039b266732e638697f1c5dc4a
--- 1/phpdbg_prompt.c
--- 2/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@@ -485,10 -485,10 +485,10 @@@ out
  
  PHPDBG_COMMAND(eval) /* {{{ */
  {
-       zend_bool stepping = (PHPDBG_G(flags) & PHPDBG_IS_STEPPING);
+       zend_bool stepping = ((PHPDBG_G(flags) & PHPDBG_IS_STEPPING)==PHPDBG_IS_STEPPING);
        zval retval;
        char *code = NULL;
 -      
 +
        if (!(PHPDBG_G(flags) & PHPDBG_IS_STEPONEVAL)) {
                PHPDBG_G(flags) &= ~ PHPDBG_IS_STEPPING;
        }
@@@ -1210,9 -1210,10 +1210,10 @@@ zend_vm_enter
        } while(!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING));\
  } while(0)
  
 -              /* allow conditional breakpoints and 
 +              /* allow conditional breakpoints and
                        initialization to access the vm uninterrupted */
-               if (PHPDBG_G(flags) & PHPDBG_IN_COND_BP|PHPDBG_IS_INITIALIZING) {
+               if ((PHPDBG_G(flags) & PHPDBG_IN_COND_BP) ||
+                       (PHPDBG_G(flags) & PHPDBG_IS_INITIALIZING)) {
                        /* skip possible breakpoints */
                        goto next;
                }