diff options
| author | Andrey Hristov <andrey@php.net> | 2014-04-10 16:49:13 +0300 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2014-04-10 16:49:13 +0300 |
| commit | 090c3e87c0449e6eadf83815bb57c8a6eff4b56e (patch) | |
| tree | 946fdc55ed17d2dc07a99b388565cc96197026dd /sapi/phpdbg/phpdbg.c | |
| parent | 63791d055ad64762c3f63e08ca7ad8ba1f44e0ab (diff) | |
| parent | 3204ad5858a5abc50b11b8527d22c82eb07a80cc (diff) | |
| download | php-git-090c3e87c0449e6eadf83815bb57c8a6eff4b56e.tar.gz | |
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Conflicts:
ext/mysqli/tests/mysqli_begin_transaction.phpt
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 6cb1645e65..51a328d0b5 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -35,6 +35,7 @@ # include <sys/select.h> # include <sys/time.h> # include <sys/types.h> +# include <netinet/in.h> # include <unistd.h> # include <arpa/inet.h> #endif /* }}} */ |