Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  cleanup old unused typedef

Author: remicollet

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];