diff options
author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-05-29 16:37:36 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-05-29 16:37:36 +0200 |
commit | ebced326c99f6d7ffac5312312a9cc7b2449e1db (patch) | |
tree | 99757e1240a0af4cd0ff809c82c62226a940c8a7 /gl/tests | |
parent | d063057c03415e85f4113b497b37cd494e1817c4 (diff) | |
download | gnutls-ebced326c99f6d7ffac5312312a9cc7b2449e1db.tar.gz |
Revert "updated gnulib"
This reverts commit c040ce6dd05b48b971d8dcc8fc8f23957ed15f9c.
Diffstat (limited to 'gl/tests')
-rw-r--r-- | gl/tests/inttypes.in.h | 4 | ||||
-rw-r--r-- | gl/tests/test-read-file.c | 6 | ||||
-rw-r--r-- | gl/tests/test-stddef.c | 10 |
3 files changed, 2 insertions, 18 deletions
diff --git a/gl/tests/inttypes.in.h b/gl/tests/inttypes.in.h index 78846f6968..13a72bee90 100644 --- a/gl/tests/inttypes.in.h +++ b/gl/tests/inttypes.in.h @@ -51,10 +51,6 @@ #endif /* Get CHAR_BIT. */ #include <limits.h> -/* On mingw, __USE_MINGW_ANSI_STDIO only works if <stdio.h> is also included */ -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -# include <stdio.h> -#endif #if !(INT_MIN == INT32_MIN && INT_MAX == INT32_MAX) # error "This file assumes that 'int' has exactly 32 bits. Please report your platform and compiler to <bug-gnulib@gnu.org>." diff --git a/gl/tests/test-read-file.c b/gl/tests/test-read-file.c index f8b160f58c..cfa52371ab 100644 --- a/gl/tests/test-read-file.c +++ b/gl/tests/test-read-file.c @@ -57,8 +57,7 @@ main (void) /* FILE1 is a regular file or a symlink to a regular file. */ if (len != statbuf.st_size) { - fprintf (stderr, "Read %lu from %s...\n", - (unsigned long) len, FILE1); + fprintf (stderr, "Read %ld from %s...\n", (unsigned long) len, FILE1); err = 1; } } @@ -99,8 +98,7 @@ main (void) is not a regular file. */ if (len != 0) { - fprintf (stderr, "Read %lu from %s...\n", - (unsigned long) len, FILE2); + fprintf (stderr, "Read %ld from %s...\n", (unsigned long) len, FILE2); err = 1; } free (out); diff --git a/gl/tests/test-stddef.c b/gl/tests/test-stddef.c index aa6ae549cc..317949655e 100644 --- a/gl/tests/test-stddef.c +++ b/gl/tests/test-stddef.c @@ -55,16 +55,6 @@ verify (alignof (ptrdiff_t) <= alignof (max_align_t)); verify (alignof (size_t) <= alignof (max_align_t)); verify (alignof (wchar_t) <= alignof (max_align_t)); verify (alignof (struct d) <= alignof (max_align_t)); -#if defined __GNUC__ || defined __IBM__ALIGNOF__ -verify (__alignof__ (double) <= __alignof__ (max_align_t)); -verify (__alignof__ (int) <= __alignof__ (max_align_t)); -verify (__alignof__ (long double) <= __alignof__ (max_align_t)); -verify (__alignof__ (long int) <= __alignof__ (max_align_t)); -verify (__alignof__ (ptrdiff_t) <= __alignof__ (max_align_t)); -verify (__alignof__ (size_t) <= __alignof__ (max_align_t)); -verify (__alignof__ (wchar_t) <= __alignof__ (max_align_t)); -verify (__alignof__ (struct d) <= __alignof__ (max_align_t)); -#endif int main (void) |