summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--phpdbg_cmd.h2
-rw-r--r--phpdbg_io.c6
2 files changed, 2 insertions, 6 deletions
diff --git a/phpdbg_cmd.h b/phpdbg_cmd.h
index e164691e59..3896551c9a 100644
--- a/phpdbg_cmd.h
+++ b/phpdbg_cmd.h
@@ -171,7 +171,7 @@ PHPDBG_API void phpdbg_param_debug(const phpdbg_param_t *param, const char *msg)
#define PHPDBG_COMMAND_ARGS param TSRMLS_CC
-#define PHPDBG_END_COMMAND {NULL, 0, NULL, 0, '\0', NULL, NULL, '\0', NULL, 0}
+#define PHPDBG_END_COMMAND {NULL, 0, NULL, 0, '\0', NULL, NULL, NULL, NULL, 0}
/*
* Default Switch Case
diff --git a/phpdbg_io.c b/phpdbg_io.c
index 019e1e8e1b..97f0356285 100644
--- a/phpdbg_io.c
+++ b/phpdbg_io.c
@@ -41,16 +41,12 @@
#include <arpa/inet.h>
#endif
#include <netdb.h>
-
#include <fcntl.h>
-
#include <poll.h>
#endif
-
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
-
PHPDBG_API int phpdbg_consume_bytes(int sock, char *ptr, int len, int tmo TSRMLS_DC) {
int got_now, i = len, j;
char *p = ptr;
@@ -117,7 +113,7 @@ recv_once:
PHPDBG_API int phpdbg_send_bytes(int sock, const char *ptr, int len) {
int sent, i = len;
- char *p = ptr;
+ const char *p = ptr;
/* XXX poll/select needed here? */
while(i > 0) {
sent = send(sock, p, i, 0);