From: Roland McGrath <roland@hack.frob.com>
Date: Fri, 3 May 2013 22:15:49 +0000 (-0700)
Subject: Header order hell
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07d11f21e061d9837d523cb6efc5af85257a2932;p=thirdparty%2Fglibc.git

Header order hell
---

diff --git a/sysdeps/nacl/nacl-interfaces.c b/sysdeps/nacl/nacl-interfaces.c
index 95b722e080f..a863d87bf19 100644
--- a/sysdeps/nacl/nacl-interfaces.c
+++ b/sysdeps/nacl/nacl-interfaces.c
@@ -17,9 +17,8 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
-#include "nacl-interfaces.h"
-
-#include <native_client/src/untrusted/irt/irt.h>
+#include <nacl-interfaces.h>
+#include <ldsodefs.h>
 
 
 /* These magic symbols are provided implicitly by the linker to
diff --git a/sysdeps/nacl/nacl-interfaces.h b/sysdeps/nacl/nacl-interfaces.h
index 04545a52755..e5fd5ed35cd 100644
--- a/sysdeps/nacl/nacl-interfaces.h
+++ b/sysdeps/nacl/nacl-interfaces.h
@@ -22,7 +22,6 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <ldsodefs.h>
 #include <sys/types.h>
 
 /* <nacl-irt.h> is massaged from native_client/src/untrusted/irt/irt.h so
diff --git a/sysdeps/nacl/nacl_interface_query.c b/sysdeps/nacl/nacl_interface_query.c
index a8fcc197b63..57ac09b65d0 100644
--- a/sysdeps/nacl/nacl_interface_query.c
+++ b/sysdeps/nacl/nacl_interface_query.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <nacl-interfaces.h>
+#include <ldsodefs.h>
 
 #ifdef SHARED