com php-src: fix windows build build shared on windows: config.w32 phpdbg.h phpdbg_set.c
| From: | Bob Weinand | Date: | Tue, 26 Nov 2013 07:53:08 +0000 |
| Subject: | com php-src: fix windows build build shared on windows: config.w32 phpdbg.h phpdbg_set.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74554@lists.php.net to get a copy of this message | ||
Commit: bc7df607ab2d7771a3c2226b46598645e67e053f
Author: krakjoe <joe.watkins@live.co.uk> Tue, 26 Nov 2013 07:53:08 +0000
Parents: 2942caff29fc685a153cb8bf5f73f8a98ea6e2b1
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bc7df607ab2d7771a3c2226b46598645e67e053f
Log:
fix windows build
build shared on windows
Changed paths:
M config.w32
M phpdbg.h
M phpdbg_set.c
Diff:
diff --git a/config.w32 b/config.w32
index 89778a3...25458d5 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 6962cdb..7046ec3 100644
--- a/phpdbg.h
+++ b/phpdbg.h
@@ -44,6 +44,10 @@
#if defined(_WIN32) && !defined(__MINGW32__)
# include <windows.h>
# 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 f326560..a0f5e74 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;