From ccd99a5eb52b7dfb7fd5501a6b645715c409c774 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 12 Jun 2003 16:05:10 +0000
Subject: [PATCH] <sys/socket.h> requires <sys/types.h> to already have been
 included on some platforms.

---
 config/c-library.m4 | 5 +++--
 configure           | 4 ++++
 configure.in        | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/config/c-library.m4 b/config/c-library.m4
index bd632ed7cd..bfe33ff062 100644
--- a/config/c-library.m4
+++ b/config/c-library.m4
@@ -1,5 +1,5 @@
 # Macros that test various C library quirks
-# $Header: /cvsroot/pgsql/config/c-library.m4,v 1.20 2003/06/12 07:36:51 momjian Exp $
+# $Header: /cvsroot/pgsql/config/c-library.m4,v 1.21 2003/06/12 16:05:10 tgl Exp $
 
 
 # PGAC_VAR_INT_TIMEZONE
@@ -104,7 +104,8 @@ AC_DEFUN([PGAC_STRUCT_SOCKADDR_UN],
 # it is missing then one could define it.
 AC_DEFUN([PGAC_STRUCT_SOCKADDR_STORAGE],
 [AC_CHECK_TYPES([struct sockaddr_storage], [], [],
-[#ifdef HAVE_SYS_SOCKET_H
+[#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 ])])# PGAC_STRUCT_SOCKADDR_STORAGE
diff --git a/configure b/configure
index 2056980885..35f4243436 100755
--- a/configure
+++ b/configure
@@ -9906,6 +9906,7 @@ else
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 #include "confdefs.h"
+#include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -10030,6 +10031,7 @@ else
 #line $LINENO "configure"
 #include "confdefs.h"
 #include <sys/param.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ucred.h>
 
@@ -10089,6 +10091,7 @@ else
 #line $LINENO "configure"
 #include "confdefs.h"
 #include <sys/param.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ucred.h>
 
@@ -10148,6 +10151,7 @@ else
 #line $LINENO "configure"
 #include "confdefs.h"
 #include <sys/param.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ucred.h>
 
diff --git a/configure.in b/configure.in
index 8ccff55630..46647f11e1 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Header: /cvsroot/pgsql/configure.in,v 1.259 2003/06/12 07:36:50 momjian Exp $
+dnl $Header: /cvsroot/pgsql/configure.in,v 1.260 2003/06/12 16:05:09 tgl Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -794,6 +794,7 @@ PGAC_STRUCT_ADDRINFO
 
 AC_CHECK_TYPES([struct cmsgcred, struct fcred, struct sockcred], [], [],
 [#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ucred.h>])