com php-src: windows fixes: phpdbg.c phpdbg_bp.h
| From: | Bob Weinand | Date: | Thu, 28 Nov 2013 17:21:34 +0000 |
| Subject: | com php-src: windows fixes: phpdbg.c phpdbg_bp.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74556@lists.php.net to get a copy of this message | ||
Commit: 022c621f96c9fa6e45242ef541becf35ce06ded1
Author: krakjoe <joe.watkins@live.co.uk> Thu, 28 Nov 2013 17:21:34 +0000
Parents: 26e1d57e8cfb3b8860ba89b66643e14cbef9edcc
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=022c621f96c9fa6e45242ef541becf35ce06ded1
Log:
windows fixes
Changed paths:
M phpdbg.c
M phpdbg_bp.h
Diff:
diff --git a/phpdbg.c b/phpdbg.c
index f5aaba8..39963a5 100644
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -27,12 +27,17 @@
#include "phpdbg_utils.h"
#include "phpdbg_set.h"
+#ifndef _WIN32
#include <sys/socket.h>
#include <sys/select.h>
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
#include <arpa/inet.h>
+#else
+#include <Winsock2.h>
+#define SHUT_RDWR SD_BOTH
+#endif
ZEND_DECLARE_MODULE_GLOBALS(phpdbg);
@@ -929,7 +934,9 @@ phpdbg_main:
if (streams[0] && streams[1]) {
PHPDBG_G(flags) |= PHPDBG_IS_REMOTE;
+#ifndef _WIN32
signal(SIGPIPE, SIG_IGN);
+#endif
}
PHPDBG_G(io)[PHPDBG_STDIN] = stdin;
diff --git a/phpdbg_bp..h b/phpdbg_bp.h
index 0cbddc0..cf90330 100644
--- a/phpdbg_bp.h
+++ b/phpdbg_bp.h
@@ -28,7 +28,7 @@ typedef struct _zend_op *phpdbg_opline_ptr_t; /* }}} */
int id; \
zend_uchar type; \
zend_ulong hits; \
- const char *name; /* }}} */
+ const char *name /* }}} */
/* {{{ breakpoint base */
typedef struct _phpdbg_breakbase_t {