From bc7df607ab2d7771a3c2226b46598645e67e053f Mon Sep 17 00:00:00 2001 From: krakjoe Date: Tue, 26 Nov 2013 07:53:08 +0000 Subject: [PATCH] fix windows build build shared on windows --- config.w32 | 14 +++++++++++++- phpdbg.h | 4 ++++ phpdbg_set.c | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/config.w32 b/config.w32 index 89778a3f3f..25458d54f2 100644 --- a/config.w32 +++ b/config.w32 @@ -1,7 +1,19 @@ ARG_ENABLE('phpdbg', 'Build phpdbg', 'yes'); +ARG_ENABLE('phpdbgs', 'Build phpdbg shared', 'no'); + +PHPDBG_SOURCES='phpdbg.c phpdbg_prompt.c phpdbg_cmd.c phpdbg_info.c phpdbg_help.c phpdbg_break.c phpdbg_print.c phpdbg_bp.c phpdbg_opcode.c phpdbg_list.c phpdbg_utils.c phpdbg_set.c'; +PHPDBG_DLL='php' + PHP_VERSION + 'phpdbg.dll'; +PHPDBG_EXE='phpdbg.exe'; if (PHP_PHPDBG == "yes") { - SAPI('phpdbg', 'phpdbg.c phpdbg_prompt.c phpdbg_cmd.c phpdbg_info.c phpdbg_help.c phpdbg_break.c phpdbg_print.c phpdbg_bp.c phpdbg_opcode.c phpdbg_list.c phpdbg_utils.c phpdbg_set.c', 'phpdbg.exe'); + /* build phpdbg binary */ + SAPI('phpdbg', PHPDBG_SOURCES, PHPDBG_EXE); ADD_FLAG("LIBS_PHPDBG", "ws2_32.lib user32.lib"); } +if (PHP_PHPDBGS == "yes") { + SAPI('phpdbgs', PHPDBG_SOURCES, PHPDBG_DLL, '/D PHP_PHPDBG_EXPORTS /I win32'); + ADD_FLAG("LIBS_PHPDBGS", "ws2_32.lib user32.lib"); +} + + diff --git a/phpdbg.h b/phpdbg.h index 6962cdbf4b..7046ec3d00 100644 --- a/phpdbg.h +++ b/phpdbg.h @@ -44,6 +44,10 @@ #if defined(_WIN32) && !defined(__MINGW32__) # include # include "config.w32.h" +# undef strcasecmp +# undef strncasecmp +# define strcasecmp _stricmp +# define strncasecmp _strnicmp #else # include "php_config.h" #endif diff --git a/phpdbg_set.c b/phpdbg_set.c index f3265604d0..a0f5e74a70 100644 --- a/phpdbg_set.c +++ b/phpdbg_set.c @@ -53,7 +53,7 @@ PHPDBG_SET(break) /* {{{ */ if (strncasecmp(param->str, PHPDBG_STRL("on")) == 0) { PHPDBG_G(flags) |= PHPDBG_IS_BP_ENABLED; } else if (strncasecmp(param->str, PHPDBG_STRL("off")) == 0) { - PHPDBG_G(flags) ^= PHPDBG_IS_BP_ENABLED; + PHPDBG_G(flags) &= ~PHPDBG_IS_BP_ENABLED; } break; -- 2.40.0