Browse Source

Use header include order from 1.4.x

git-svn-id: svn://svn.lighttpd.net/spawn-fcgi/trunk@22 4a9f3682-ca7b-49a8-9a55-ba4640e46f83
master
Stefan Bühler 13 years ago
parent
commit
e1f40012d6
  1. 1
      NEWS
  2. 61
      src/spawn-fcgi.c

1
NEWS

@ -14,3 +14,4 @@ NEWS
* Ignore pid-file option in no-fork mode (instead of producing empty file)
* Fix error handling for unix-socket-connect test
* Man page update
* Use header include order from 1.4.x

61
src/spawn-fcgi.c

@ -1,32 +1,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
# include "config.h"
#endif
#ifdef __WIN32
#include <winsock2.h>
#define ECONNRESET WSAECONNRESET
#define EINPROGRESS WSAEINPROGRESS
#define EALREADY WSAEALREADY
#define ECONNABORTED WSAECONNABORTED
#define ioctl ioctlsocket
#define hstrerror(x) ""
#else /* _WIN32 */
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <sys/un.h>
#include <arpa/inet.h>
#include <netdb.h>
#endif /* _WIN32 */
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
@ -39,18 +14,44 @@
#include <fcntl.h>
#ifdef HAVE_PWD_H
#include <grp.h>
#include <pwd.h>
# include <grp.h>
# include <pwd.h>
#endif
#ifdef HAVE_GETOPT_H
#include <getopt.h>
# include <getopt.h>
#endif
#define FCGI_LISTENSOCK_FILENO 0
/* "sys-socket.h" */
#ifdef __WIN32
# include <winsock2.h>
# define ECONNRESET WSAECONNRESET
# define EINPROGRESS WSAEINPROGRESS
# define EALREADY WSAEALREADY
# define ECONNABORTED WSAECONNABORTED
# define ioctl ioctlsocket
# define hstrerror(x) ""
#else /* _WIN32 */
# include <sys/socket.h>
# include <sys/ioctl.h>
# include <netinet/in.h>
# include <netinet/tcp.h>
# include <sys/un.h>
# include <arpa/inet.h>
# include <netdb.h>
#endif /* _WIN32 */
/* end "sys-socket.h" */
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
# include <sys/wait.h>
#endif
/* for solaris 2.5 and netbsd 1.3.x */

Loading…
Cancel
Save