mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 13:00:06 +00:00
330fadfc62
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.
61 lines
2.3 KiB
C
61 lines
2.3 KiB
C
/* Copyright (C) 2005-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Jakub Jelinek <jakub@redhat.com>, 2005.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/* We test the code undef conditions outside of glibc. */
|
|
#undef _LIBC
|
|
|
|
#include <pthread.h>
|
|
|
|
pthread_mutex_t mtx_normal = PTHREAD_MUTEX_INITIALIZER;
|
|
pthread_mutex_t mtx_recursive = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
|
|
pthread_mutex_t mtx_errorchk = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP;
|
|
pthread_mutex_t mtx_adaptive = PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;
|
|
pthread_rwlock_t rwl_normal = PTHREAD_RWLOCK_INITIALIZER;
|
|
pthread_rwlock_t rwl_writer
|
|
= PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP;
|
|
pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
if (mtx_normal.__data.__kind != PTHREAD_MUTEX_TIMED_NP)
|
|
return 1;
|
|
if (mtx_recursive.__data.__kind != PTHREAD_MUTEX_RECURSIVE_NP)
|
|
return 2;
|
|
if (mtx_errorchk.__data.__kind != PTHREAD_MUTEX_ERRORCHECK_NP)
|
|
return 3;
|
|
if (mtx_adaptive.__data.__kind != PTHREAD_MUTEX_ADAPTIVE_NP)
|
|
return 4;
|
|
if (rwl_normal.__data.__flags != PTHREAD_RWLOCK_PREFER_READER_NP)
|
|
return 5;
|
|
if (rwl_writer.__data.__flags
|
|
!= PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP)
|
|
return 6;
|
|
/* <bits/libc-lock.h> __libc_rwlock_init definition for libc.so
|
|
relies on PTHREAD_RWLOCK_INITIALIZER being all zeros. If
|
|
that ever changes, <bits/libc-lock.h> needs updating. */
|
|
size_t i;
|
|
for (i = 0; i < sizeof (rwl_normal); i++)
|
|
if (((char *) &rwl_normal)[i] != '\0')
|
|
return 7;
|
|
return 0;
|
|
}
|
|
|
|
#define TEST_FUNCTION do_test ()
|
|
#include "../test-skeleton.c"
|