com php-src: Fixed bug #70449 (PHP won't compile on 10.4 and 10.5 because of missing constants): NEWS sapi/phpdbg/phpdbg_io.h
| From: | Bob Weinand | Date: | Mon, 07 Sep 2015 15:28:29 +0000 |
| Subject: | com php-src: Fixed bug #70449 (PHP won't compile on 10.4 and 10.5 because of missing constants): NEWS sapi/phpdbg/phpdbg_io.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88946@lists.php.net to get a copy of this message | ||
Commit: 51272f4217b5961438cf89ac03dc3ab097db8af5
Author: Bob Weinand <bobwei9@hotmail.com> Mon, 7 Sep 2015 17:28:29 +0200
Parents: 585d8642b58a7ff5a64befcbbe5213990963a9f1
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=51272f4217b5961438cf89ac03dc3ab097db8af5
Log:
Fixed bug #70449 (PHP won't compile on 10.4 and 10.5 because of missing constants)
Bugs:
https://bugs.php.net/70449
Changed paths:
M NEWS
M sapi/phpdbg/phpdbg_io.h
Diff:
diff --git a/NEWS b/NEWS
index ba1a13b..011ca7d 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,10 @@ PHP NEWS
. Implemented FR #70438 (Add IV parameter for openssl_seal and openssl_open)
(Jakub Zelenka)
+- Phpdbg:
+ . Fixed bug #70449 (PHP won't compile on 10.4 and 10.5 because of missing
+ constants). (Bob)
+
- Streams:
. Fixed bug #70361 (HTTP stream wrapper doesn't close keep-alive connections).
(Niklas Keller)
diff --git a/sapi/phpdbg/phpdbg_io.h b/sapi/phpdbg/phpdbg_io.h
index 3e25fc5..fdd579d 100644
--- a/sapi/phpdbg/phpdbg_io..h
+++ b/sapi/phpdbg/phpdbg_io.h
@@ -21,6 +21,11 @@
#include "phpdbg.h"
+/* Older versions of glibc <= 2.3.0 and <= OS X 10.5 do not have this constant defined */
+#ifndef AI_NUMERICSERV
+#define AI_NUMERICSERV 0
+#endif
+
PHPDBG_API int phpdbg_consume_stdin_line(char *buf);
PHPDBG_API int phpdbg_consume_bytes(int sock, char *ptr, int len, int tmo);