Changeset 668

Show
Ignore:
Timestamp:
08/07/2009 04:26:35 AM (4 years ago)
Author:
moo
Message:

make #ifdef's looks better for E_DEPRECATED

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/utils.c

    r660 r668  
    530530#define OG(x) (sandbox->orig_##x) 
    531531/* }}} */ 
    532 #ifdef E_STRICT 
     532#if defined(E_STRICT) || defined(E_DEPRECATED) 
    533533static void xc_sandbox_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) /* {{{ */ 
    534534{ 
    … …  
    540540    assert(sandbox != NULL); 
    541541    switch (type) { 
     542#ifdef E_STRICT: 
    542543    case E_STRICT: 
     544#endif 
    543545#ifdef E_DEPRECATED 
    544546    case E_DEPRECATED: 

  • trunk/utils.h

    r662 r668  
    9898    Bucket    *tmp_internal_class_tail; 
    9999 
    100 #ifdef E_STRICT 
     100#if defined(E_STRICT) || defined(E_DEPRECATED) 
    101101    int orig_user_error_handler_error_reporting; 
    102102    void (*orig_zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);