diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-12-16 17:21:01 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-12-16 17:21:01 +0100 |
| commit | f01d5faf305d6ca3b3a40026fc9ba5f1db244b4e (patch) | |
| tree | 7597e22b3c10c4bf2104cfc9eecd8d5c45450117 /sapi/cli | |
| parent | 83964e0468e7f4ae39cd1435f3b53f62e174ac21 (diff) | |
| parent | 14393b5fb3713fd322fc98d899b14297088a88e9 (diff) | |
| download | php-git-f01d5faf305d6ca3b3a40026fc9ba5f1db244b4e.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
Diffstat (limited to 'sapi/cli')
| -rw-r--r-- | sapi/cli/ps_title.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sapi/cli/ps_title.c b/sapi/cli/ps_title.c index 303115f7bc..7b00348be6 100644 --- a/sapi/cli/ps_title.c +++ b/sapi/cli/ps_title.c @@ -28,16 +28,6 @@ * The following code is adopted from the PostgreSQL's ps_status(.h/.c). */ -#include "ps_title.h" -#include <stdio.h> - -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - -#include <string.h> -#include <stdlib.h> - #ifdef PHP_WIN32 #include "config.w32.h" #include <windows.h> @@ -48,6 +38,17 @@ extern char** environ; #endif +#include "ps_title.h" +#include <stdio.h> + +#ifdef HAVE_UNISTD_H +#include <sys/types.h> +#include <unistd.h> +#endif + +#include <string.h> +#include <stdlib.h> + #ifdef HAVE_SYS_PSTAT_H #include <sys/pstat.h> /* for HP-UX */ #endif |