Bug 20729: Include libc-internal.h where required.

The original fix for bug 20729 failed to include
libc-internal.h in the files that needed them and
this caused build failures on machines that don't
implicitly include this header. This commit fixes
that by following the consensus rule that a header,
if needed, should always be directly included.

diff --git a/ChangeLog b/ChangeLog
index 1a14fdfab69fd080e2a6a5f6755b1c73ef514e20..831c876b6e33ea81c4d918901885b456f5e66a49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-10-31  Carlos O'Donell  <carlos@redhat.com>
+
+       [Bz #20729]
+       * locale/weight.h: Include libc-internal.h.
+       * locale/weightwc.h: Likewise.
+       * nptl/nptl_dbP.h: Likewise.
+
 2016-10-31  Brent W. Baccala  <cosine@freesoft.org>
 
        * sysdeps/mach/hurd/dl-sysdep.c (__mmap): Do not deallocate memobj_wr
@@ -16,7 +23,7 @@
        [BZ #20729]
        * include/libc-internal.h (DIAG_IGNORE_Os_NEEDS_COMMENT):
        Define.
-       * iso-2022-cn-ext.c: Include libc-internal.h and ignore
+       * iconvdata/iso-2022-cn-ext.c: Include libc-internal.h and ignore
        -Wmaybe-uninitialized for BODY macro only for -Os compiles.
        * locale/weight.h (findix): Ignore -Wmaybe-uninitialized error
        for seq2.back_us and seq1.back_us only for -Os compiles.

diff --git a/locale/weight.h b/locale/weight.h
index 1f61f01e1ecc96fdad45f96d2d49ae3864187bac..19b8e4a2df246d44a0dda86a3e46ba420a8c3983 100644 (file)
--- a/locale/weight.h
+++ b/locale/weight.h
@@ -19,6 +19,8 @@
 #ifndef _WEIGHT_H_
 #define _WEIGHT_H_     1
 
+#include <libc-internal.h>
+
 /* Find index of weight.  */
 static inline int32_t __attribute__ ((always_inline))
 findidx (const int32_t *table,

diff --git a/locale/weightwc.h b/locale/weightwc.h
index e42ce13241232e23c52f1e693cf8dc0e29e34eaf..ae189658eb5324aa1eb8e499d58c8b303bb5659e 100644 (file)
--- a/locale/weightwc.h
+++ b/locale/weightwc.h
@@ -19,6 +19,8 @@
 #ifndef _WEIGHTWC_H_
 #define _WEIGHTWC_H_   1
 
+#include <libc-internal.h>
+
 /* Find index of weight.  */
 static inline int32_t __attribute__ ((always_inline))
 findidx (const int32_t *table,

diff --git a/nptl_db/thread_dbP.h b/nptl_db/thread_dbP.h
index b53f1c1deffa68054bdcc1815e07da9bf70a22d8..f448547cd3c967742572df7005f733646f3199b4 100644 (file)
--- a/nptl_db/thread_dbP.h
+++ b/nptl_db/thread_dbP.h
@@ -30,6 +30,7 @@
 #include "../nptl/pthreadP.h"          /* This is for *_BITMASK only.  */
 #include <list.h>
 #include <gnu/lib-names.h>
+#include <libc-internal.h>
 
 /* Indeces for the symbol names.  */
 enum