diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-10-25 00:37:10 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-10-25 00:37:10 +0000 |
| commit | 4bbe4e2185c5484328182720ff7b3bb4f9593bff (patch) | |
| tree | cd67e40a74928c0f58d4f5b79d2e260e4099fee7 /libc/nptl/tst-tls4.c | |
| parent | 91b4be71461f78cabe1fb5f164cea71b60e9e98a (diff) | |
| download | eglibc2-4bbe4e2185c5484328182720ff7b3bb4f9593bff.tar.gz | |
Merge changes between r15223 and r15532 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@15545 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/nptl/tst-tls4.c')
| -rw-r--r-- | libc/nptl/tst-tls4.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libc/nptl/tst-tls4.c b/libc/nptl/tst-tls4.c index 52775dee8..d33c97216 100644 --- a/libc/nptl/tst-tls4.c +++ b/libc/nptl/tst-tls4.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2003. @@ -25,7 +25,6 @@ #include <unistd.h> #include <tls.h> -#if HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE #define N 3 @@ -181,11 +180,4 @@ do_test (void) #define TIMEOUT 5 #define TEST_FUNCTION do_test () - -#else - -#define TEST_FUNCTION 0 - -#endif - #include "../test-skeleton.c" |