@@ -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).

diff --git a/changelog b/changelog
index 48fa272fdc88e2e363344fd693b6d29310bacbad..51cc70e3c1283dd4526d9c90fb1910634605654c 100644 (file)
--- 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 afec8ca934704d0dbf064b322714fd77c0b4f2b5..5d87442322241805d30456149ccba0cf4e4a015c 100644 (file)
--- 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 5b736808c44230005aa5b94f579fe2f9c4d6b8bc..f7b2ba7d57910fc65110affb85646bc801c91952 100644 (file)
--- 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 ae84974a6a59d9629b4584c3fc0f6ed9bd2fe842..4297fca0192540c90e9a3acc2b799043a14e6aeb 100644 (file)
--- 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 f034f0f57e75564393b21e3541f388e114722030..45ae0444a1e5fd7112ca0ad5e2b22848c3159dd6 100644 (file)
--- 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>