com php-src: make build work moar: phpdbg_wait.c phpdbg _webdata_transfer.c
| From: | Bob Weinand | Date: | Tue, 07 Oct 2014 11:36:03 +0000 |
| Subject: | com php-src: make build work moar: phpdbg_wait.c phpdbg _webdata_transfer.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82585@lists.php.net to get a copy of this message | ||
Commit: 4b3a11debbead58c9034dbf34218b9cd2bb885a5
Author: krakjoe <joe.watkins@live.co.uk> Tue, 7 Oct 2014 12:36:03 +0100
Parents: f545ef48eba6c3c9e8b849a15deefdda76920807
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4b3a11debbead58c9034dbf34218b9cd2bb885a5
Log:
make build work moar
Changed paths:
M phpdbg_wait.c
M phpdbg_webdata_transfer.c
Diff:
diff --git a/phpdbg_wait.c b/phpdbg_wait.c
index e2bded0..11279a9 100644
--- a/phpdbg_wait.c
+++ b/phpdbg_wait.c
@@ -127,6 +127,7 @@ static int phpdbg_array_intersect(phpdbg_intersect_ptr *info, zval ***ptr) {
}
void phpdbg_webdata_decompress(char *msg, int len TSRMLS_DC) {
+#ifdef HAVE_JSON
zval *free_zv = NULL;
zval zv, **zvpp;
HashTable *ht;
@@ -357,10 +358,12 @@ void phpdbg_webdata_decompress(char *msg, int len TSRMLS_DC) {
/* Reapply raw input */
/* ??? */
+#endif
}
PHPDBG_COMMAND(wait) /* {{{ */
{
+#ifdef HAVE_JSON
struct sockaddr_un local, remote;
int rlen, sr, sl;
unlink(PHPDBG_G(socket_path));
@@ -412,5 +415,5 @@ PHPDBG_COMMAND(wait) /* {{{ */
phpdbg_notice("Successfully imported request data, stopped before executing");
return SUCCESS;
+#endif
} /* }}} */
-
diff --git a/phpdbg_webdata_transfer.c b/phpdbg_webdata_transfer.c
index 8ca3085..e7438ea 100644
--- a/phpdbg_webdata_transfer.c
+++ b/phpdbg_webdata_transfer.c
@@ -20,6 +20,7 @@
#include "ext/json/php_json.h"
PHPDBG_API void phpdbg_webdata_compress(char **msg, int *len TSRMLS_DC) {
+#ifdef HAVE_JSON
smart_str buf = {0};
zval array;
HashTable *ht;
@@ -180,4 +181,5 @@ PHPDBG_API void phpdbg_webdata_compress(char **msg, int *len TSRMLS_DC) {
*msg = buf.c;
*len = buf..len;
zval_dtor(&array);
+#endif
}