summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.m42
-rw-r--r--phpdbg_cmd.c2
-rw-r--r--phpdbg_set.c2
-rw-r--r--phpdbg_utils.c5
4 files changed, 5 insertions, 6 deletions
diff --git a/config.m4 b/config.m4
index 7a1f16465a..640b5ac5ae 100644
--- a/config.m4
+++ b/config.m4
@@ -17,7 +17,7 @@ if test "$PHP_PHPDBG" != "no"; then
AC_DEFINE(PHPDBG_DEBUG, 0, [ ])
fi
- PHP_PHPDBG_CFLAGS="-I$abc_srcdir"
+ PHP_PHPDBG_CFLAGS="-D_GNU_SOURCE"
PHP_PHPDBG_FILES="phpdbg.c phpdbg_prompt.c phpdbg_help.c phpdbg_break.c phpdbg_print.c phpdbg_bp.c phpdbg_opcode.c phpdbg_list.c phpdbg_utils.c phpdbg_info.c phpdbg_cmd.c phpdbg_set.c"
PHP_SUBST(PHP_PHPDBG_CFLAGS)
diff --git a/phpdbg_cmd.c b/phpdbg_cmd.c
index 037e6dfd63..42a84e3b9f 100644
--- a/phpdbg_cmd.c
+++ b/phpdbg_cmd.c
@@ -394,7 +394,7 @@ PHPDBG_API int phpdbg_do_cmd(const phpdbg_command_t *command, phpdbg_input_t *in
int arg;
for (arg=1; arg<input->argc; arg++) {
phpdbg_debug(
- "\t#%d: [%s=%d]",
+ "\t#%d: [%s=%zu]",
arg,
input->argv[arg]->string,
input->argv[arg]->length);
diff --git a/phpdbg_set.c b/phpdbg_set.c
index 0c046eeaa1..1c6d3bef3c 100644
--- a/phpdbg_set.c
+++ b/phpdbg_set.c
@@ -151,7 +151,7 @@ PHPDBG_SET(colors) /* {{{ */
phpdbg_error(
"set colors used incorrectly: set colors <on|off>");
}
-
+
done:
return SUCCESS;
} /* }}} */
diff --git a/phpdbg_utils.c b/phpdbg_utils.c
index 4b58448f0a..67e1cbc464 100644
--- a/phpdbg_utils.c
+++ b/phpdbg_utils.c
@@ -19,6 +19,7 @@
#include <stdio.h>
#include <ctype.h>
+#include <string.h>
#include "zend.h"
#include "php.h"
#include "spprintf.h"
@@ -246,12 +247,10 @@ PHPDBG_API int phpdbg_rlog(FILE *fp, const char *fmt, ...) { /* {{{ */
int rc = 0;
va_list args;
- time_t now;
struct timeval tp;
va_start(args, fmt);
- if (gettimeofday(&tp, NULL) == SUCCESS)
- {
+ if (gettimeofday(&tp, NULL) == SUCCESS) {
char friendly[100];
char *format = NULL, *buffer = NULL;