summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2015-01-06 11:06:53 +0100
committerRemi Collet <remi@php.net>2015-01-06 11:06:53 +0100
commit0ba32e5cf931d8a46dff846371e72d3e71cad5e3 (patch)
tree34e3f2daeaf9ce19b858920345310e92198e3ecb
parent27ff425b78a1355a24d44eb719291ebd9022bc87 (diff)
parent8404f8ac2a540780422d9813138a9c6785405312 (diff)
downloadphp-git-0ba32e5cf931d8a46dff846371e72d3e71cad5e3.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: cleanup old unused typedef
-rw-r--r--sapi/fpm/fpm/fastcgi.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sapi/fpm/fpm/fastcgi.c b/sapi/fpm/fpm/fastcgi.c
index 5d46913cec..be3911c978 100644
--- a/sapi/fpm/fpm/fastcgi.c
+++ b/sapi/fpm/fpm/fastcgi.c
@@ -37,8 +37,6 @@
#include <windows.h>
- typedef unsigned int in_addr_t;
-
struct sockaddr_un {
short sun_family;
char sun_path[MAXPATHLEN];