2.0.1-rc6: include linux/types.h before linux/errqueue.h

PATCH In review Matthias Andree 1 participant 1 message Jul 20, 2005

Share & tools

Matthias Andree

author

2005-07-20 02:17 UTC #0 lore raw

PATCH 1/2 2.0.1-rc6: include linux/types.h before linux/errqueue.h

The attached patch includes linux/types.h before checking linux/errqueue.h, as future autoconf versions might otherwise assume linux/errqueue.h isn't present, fixing a huge configure warnings along the way.

Signature · 1 line

Matthias Andree

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvpn/openvpn/ChangeLog,v
retrieving revision 1.135

ChangeLog +6 -1

diff -u -r1.135 ChangeLog
@@ -3,6 +3,11 @@
 
 $Id: ChangeLog,v 1.135 2005/07/15 18:54:00 jimyonan Exp $
 
+2005.XX.XX -- Version 2.0.1-rc7
+
+* Include linux/types.h before checking for linux/errqueue.h (Matthias
+  Andree).
+
 2005.07.15 -- Version 2.0.1-rc6
 
 * Commented out "user nobody" and "group nobody" in sample

@@ -26,7 +31,7 @@
 
 2005.06.15 -- Version 2.0.1-rc4
 
-* Support LZO 2.0, including changes to configure script to
+* Support LZO 2.00, including changes to configure script to
   autodetect LZO version.
 
 2005.06.12 -- Version 2.0.1-rc3

Index: configure.ac
===================================================================
RCS file: /cvsroot/openvpn/openvpn/configure.ac,v
retrieving revision 1.143

configure.ac +6 -2

diff -u -r1.143 configure.ac
@@ -264,9 +264,13 @@
 		 netinet/in.h netinet/in_systm.h netinet/ip.h dnl
 		 netinet/if_ether.h netinet/tcp.h resolv.h arpa/inet.h dnl
 		 netdb.h sys/uio.h linux/if_tun.h linux/sockios.h dnl
-		 linux/types.h linux/errqueue.h dnl
-                 sys/poll.h sys/epoll.h
+		 linux/types.h sys/poll.h sys/epoll.h dnl
 )
+AC_CHECK_HEADERS(linux/errqueue.h,,,
+	[#ifdef HAVE_LINUX_TYPES_H
+	 # include <linux/types.h>
+	 #endif
+	])
 AC_CACHE_SAVE
 
 dnl check that in_addr_t is defined