X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fnetinet_in_.h;h=aa00e45ced99a2ca2f1db768ef1dd943b6ac2d7e;hb=024eeefda59f214eeaac745db9f3e982b9a726c3;hp=d46ec78e9b66a8220edbc7f667dfe5abae88f426;hpb=af36a1d14d56f565ba2ffc4edf046b579c2b9148;p=gnulib.git

diff --git a/lib/netinet_in_.h b/lib/netinet_in_.h
index d46ec78e9..aa00e45ce 100644
--- a/lib/netinet_in_.h
+++ b/lib/netinet_in_.h
@@ -16,20 +16,22 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _GL_NETINET_IN_H
-#define _GL_NETINET_IN_H
 
 #if @HAVE_NETINET_IN_H@
 
 /* On many platforms, <netinet/in.h> assumes prior inclusion of
    <sys/types.h>.  */
-
 # include <sys/types.h>
-# if @HAVE_INCLUDE_NEXT@
-#  include_next <netinet/in.h>
-# else
-#  include @ABSOLUTE_NETINET_IN_H@
-# endif
-#else
+
+/* The include_next requires a split double-inclusion guard.  */
+# @INCLUDE_NEXT@ @NEXT_NETINET_IN_H@
+
+#endif
+
+#ifndef _GL_NETINET_IN_H
+#define _GL_NETINET_IN_H
+
+#if !@HAVE_NETINET_IN_H@
 
 /* A platform that lacks <netinet/in.h>.  */
 
@@ -38,3 +40,4 @@
 #endif
 
 #endif /* _GL_NETINET_IN_H */
+#endif /* _GL_NETINET_IN_H */