diff options
| -rw-r--r-- | Zend/config.w32.h | 3 | ||||
| -rw-r--r-- | Zend/libzend.dsp | 4 | ||||
| -rw-r--r-- | Zend/libzendts.dsp | 4 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 2 | ||||
| -rw-r--r-- | Zend/zend_compile.h | 2 |
5 files changed, 6 insertions, 9 deletions
diff --git a/Zend/config.w32.h b/Zend/config.w32.h index 66c52c2c2d..358f7d0b54 100644 --- a/Zend/config.w32.h +++ b/Zend/config.w32.h @@ -17,8 +17,6 @@ typedef unsigned int uint; #undef inline #endif -#define ZEND_DEBUG 1 - #define zend_sprintf sprintf /* Visual C++ doesn't really work with inline for C */ @@ -37,5 +35,4 @@ typedef unsigned int uint; # define ZEND_API __declspec(dllimport) #endif - #endif /* _ZEND_CONFIG_W32_H */
\ No newline at end of file diff --git a/Zend/libzend.dsp b/Zend/libzend.dsp index 22f5444847..34157e7a10 100644 --- a/Zend/libzend.dsp +++ b/Zend/libzend.dsp @@ -39,7 +39,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDebug" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug" /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "WIN32" /D "_MBCS" /FR /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug" /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x40d /d "NDebug" # ADD RSC /l 0x40d /d "NDebug" @@ -61,7 +61,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_Debug" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_Debug" /D "_LIB" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_Debug" /D "_LIB" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c # ADD BASE RSC /l 0x40d /d "_Debug" # ADD RSC /l 0x40d /d "_Debug" BSC32=bscmake.exe diff --git a/Zend/libzendts.dsp b/Zend/libzendts.dsp index 5b93e900ca..e4b0221fe4 100644 --- a/Zend/libzendts.dsp +++ b/Zend/libzendts.dsp @@ -39,7 +39,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release_TS" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDebug_TS" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /FR /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x40d /d "NDebug_TS" # ADD RSC /l 0x40d /d "NDebug_TS" @@ -61,7 +61,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug_TS" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_Debug_TS" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_Debug_TS" /D "WIN32" /D "_MBCS" /D "_LIB" /D "LIBZEND_EXPORTS" /D "ZTS" /D "TSRM_EXPORTS" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_Debug_TS" /D "_LIB" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D "ZTS" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c # ADD BASE RSC /l 0x40d /d "_Debug_TS" # ADD RSC /l 0x40d /d "_Debug_TS" BSC32=bscmake.exe diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index cd83a7b897..99389d65cc 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -836,7 +836,7 @@ void do_return(znode *expr CLS_DC) } -void do_bind_function_or_class(zend_op *opline, HashTable *function_table, HashTable *class_table) +ZEND_API void do_bind_function_or_class(zend_op *opline, HashTable *function_table, HashTable *class_table) { switch (opline->extended_value) { case ZEND_DECLARE_FUNCTION: { diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 1a1f46dfcd..a5c204c5a6 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -257,7 +257,7 @@ void do_begin_dynamic_function_call(znode *function_name CLS_DC); void do_begin_class_member_function_call(znode *class_name, znode *function_name CLS_DC); void do_end_function_call(znode *function_name, znode *result, znode *argument_list, int is_method CLS_DC); void do_return(znode *expr CLS_DC); -void do_bind_function_or_class(zend_op *opline, HashTable *function_table, HashTable *class_table); +ZEND_API void do_bind_function_or_class(zend_op *opline, HashTable *function_table, HashTable *class_table); void do_early_binding(CLS_D); void do_pass_param(znode *param, int op, int offset CLS_DC); |