From 62ef470315d93ad327fee82c393589a21289a6d2 Mon Sep 17 00:00:00 2001
Message-Id: <62ef470315d93ad327fee82c393589a21289a6d2.1717766462.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sun, 24 Nov 2002 17:23:01 +0000
Subject: [PATCH] @@ -6,6 +6,7 @@      (and there doesn't seem to be much
 explanation why). +  * Always #include <sys/types.h> before <sys/socket.h>
 (for FreeBSD 4.6).
Organization: Straylight/Edgeware

From: ian <ian>

---
 changelog              | 1 +
 regress/hsyscalls.h    | 1 +
 regress/hsyscalls.h.m4 | 1 +
 src/adns.h             | 4 ++--
 src/setup.c            | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 48fa272..51cc70e 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,7 @@ adns (1.1); urgency=medium
   * Don't use <sys/select.h> any more, it was a mistake made in pre-1.0
     (and there doesn't seem to be much explanation why).
   * Understand and sort of check OpenBSD `lookup' resolv.conf directive.
+  * Always #include <sys/types.h> before <sys/socket.h> (for FreeBSD 4.6).
 
  --
 
diff --git a/regress/hsyscalls.h b/regress/hsyscalls.h
index afec8ca..5d87442 100644
--- a/regress/hsyscalls.h
+++ b/regress/hsyscalls.h
@@ -1,5 +1,6 @@
 #ifndef HSYSCALLS_H_INCLUDED
 #define HSYSCALLS_H_INCLUDED
+#include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
diff --git a/regress/hsyscalls.h.m4 b/regress/hsyscalls.h.m4
index 5b73680..f7b2ba7 100644
--- a/regress/hsyscalls.h.m4
+++ b/regress/hsyscalls.h.m4
@@ -28,6 +28,7 @@ m4_include(hmacros.i4)
 #ifndef HSYSCALLS_H_INCLUDED
 #define HSYSCALLS_H_INCLUDED
 
+#include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
diff --git a/src/adns.h b/src/adns.h
index ae84974..4297fca 100644
--- a/src/adns.h
+++ b/src/adns.h
@@ -51,7 +51,7 @@
  *  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  *
- *  $Id: adns.h,v 1.83 2000/09/17 01:56:18 ian Exp $
+ *  $Id: adns.h,v 1.84 2002/11/24 17:23:01 ian Exp $
  */
 
 #ifndef ADNS_H_INCLUDED
@@ -59,9 +59,9 @@
 
 #include <stdio.h>
 
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <sys/types.h>
 #include <sys/time.h>
 #include <unistd.h>
 
diff --git a/src/setup.c b/src/setup.c
index f034f0f..45ae044 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -32,6 +32,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include <sys/types.h>
 #include <netdb.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-- 
[mdw]