Ensure `wint_t' is defined before use in include/stdio.h

While trying to get nptl/tst-initializers1.c to include the test skeleton, I
came across a couple of speed bumps. Firstly: after making the appropriate
changes to the test, running `make check' led to this error:

> In file included from ../malloc/malloc.h:24:0,
..
>                  from tst-initializers1.c:60:
> ../include/stdio.h:111:1: error: unknown type name `wint_t'
>  extern wint_t __getwc_unlocked (FILE *__fp);

So, `wint_t' is used before being defined. Question: Why did test-skeleton.c
not cause this error in any of the other tests that include it?

Anyway, I noticed include/stdio.h includes stddef.h, which in turn defines
`wint_t', but only if `__need_wint_t' is defined. So I put in a
`#define __need_wint_t' before the include to get rid of the error. Is that
the correct fix?

A subsequent `make && make check' led to this second error:

>                  from tst-initializers1-c89.c:1:
> ../test-skeleton.c: In function `main':
> ../test-skeleton.c:356:11: error: `for' loop initial declarations are only
>  allowed in C99 mode
>            for (struct temp_name_list *n = temp_name_list;

Although there seem to be several other C89 no-noes in test-skeleton.c, I
needed only to fix this specific one for gcc-4.8.3 to stop complaining.

diff --git a/ChangeLog b/ChangeLog
index 4a2878a25a22cf4c58cc2ed8855ee1a5e3542897..4de8a25c28176b638f81fdf9c5d84a303de85eba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-18  Arjun Shankar  <arjun.is@lostca.se>
+
+       * include/stdio.h: Define __need_wint_t.
+       * test-skeleton.c: Avoid `for' loop initial declaration.
+       * nptl/tst-initializers1.c: Use test-skeleton.c.
+
 2015-05-17  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
        [BZ #18418]

diff --git a/include/stdio.h b/include/stdio.h
index 00106079499ffd4fbd32da0fb50d9521b2eb798c..043b2b56bcfe4bc987c23ce757ac192e6574acc8 100644 (file)
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -76,6 +76,7 @@ extern FILE *__old_tmpfile (void);
 
 
 #  define __need_size_t
+#  define __need_wint_t
 #  include <stddef.h>
 /* Generate a unique file name (and possibly open it).  */
 extern int __path_search (char *__tmpl, size_t __tmpl_len,

diff --git a/nptl/tst-initializers1.c b/nptl/tst-initializers1.c
index e09f7a9c4981f6e65bf93840b618540e67791909..5119ebfcb51a9a779b10c87aa65956c0b8ada7ea 100644 (file)
--- a/nptl/tst-initializers1.c
+++ b/nptl/tst-initializers1.c
@@ -30,8 +30,8 @@ pthread_rwlock_t rwl_writer
   = PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP;
 pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
 
-int
-main (void)
+static int
+do_test (void)
 {
   if (mtx_normal.__data.__kind != PTHREAD_MUTEX_TIMED_NP)
     return 1;
@@ -55,3 +55,6 @@ main (void)
       return 7;
   return 0;
 }
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"

diff --git a/test-skeleton.c b/test-skeleton.c
index 43fc236fc3b81c1245443206c68d3cd65a89668d..1332c94a86f200fd802788f887687d6e236e908e 100644 (file)
--- a/test-skeleton.c
+++ b/test-skeleton.c
@@ -352,8 +352,9 @@ main (int argc, char *argv[])
 
       if (temp_name_list != NULL)
         {
+          struct temp_name_list *n;
           fprintf (f, "temp_files=(\n");
-          for (struct temp_name_list *n = temp_name_list;
+          for (n = temp_name_list;
                n != NULL;
                n = (struct temp_name_list *) n->q.q_forw)
             fprintf (f, "  '%s'\n", n->name);