Mercurial > hg > octave-kai > gnulib-hg
changeset 15796:22a143e3638f
fgetc, fputc, fread, fwrite tests: Fix link error.
* tests/test-fgetc.c (main): Don't invoke gl_msvc_inval_ensure_handler
on non-MSVC platforms.
* tests/test-fputc.c (main): Likewise.
* tests/test-fread.c (main): Likewise.
* tests/test-fwrite.c (main): Likewise.
Reported by Jim Meyering.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Wed, 28 Sep 2011 10:57:32 +0200 |
| parents | dd52b68a488b |
| children | 81165025d9b6 |
| files | ChangeLog tests/test-fgetc.c tests/test-fputc.c tests/test-fread.c tests/test-fwrite.c |
| diffstat | 5 files changed, 19 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2011-09-28 Bruno Haible <bruno@clisp.org> + + fgetc, fputc, fread, fwrite tests: Fix link error. + * tests/test-fgetc.c (main): Don't invoke gl_msvc_inval_ensure_handler + on non-MSVC platforms. + * tests/test-fputc.c (main): Likewise. + * tests/test-fread.c (main): Likewise. + * tests/test-fwrite.c (main): Likewise. + Reported by Jim Meyering. + 2011-09-27 Bruno Haible <bruno@clisp.org> fputc, fwrite tests: Avoid test failure on MSVC.
--- a/tests/test-fgetc.c +++ b/tests/test-fgetc.c @@ -35,9 +35,10 @@ { const char *filename = "test-fgetc.txt"; - /* We don't have an fread() function that installs an invalid parameter + /* We don't have an fgetc() function that installs an invalid parameter handler so far. So install that handler here, explicitly. */ -#if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING +#if HAVE_MSVC_INVALID_PARAMETER_HANDLER \ + && MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING gl_msvc_inval_ensure_handler (); #endif
--- a/tests/test-fputc.c +++ b/tests/test-fputc.c @@ -37,7 +37,8 @@ /* We don't have an fputc() function that installs an invalid parameter handler so far. So install that handler here, explicitly. */ -#if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING +#if HAVE_MSVC_INVALID_PARAMETER_HANDLER \ + && MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING gl_msvc_inval_ensure_handler (); #endif
--- a/tests/test-fread.c +++ b/tests/test-fread.c @@ -37,7 +37,8 @@ /* We don't have an fread() function that installs an invalid parameter handler so far. So install that handler here, explicitly. */ -#if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING +#if HAVE_MSVC_INVALID_PARAMETER_HANDLER \ + && MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING gl_msvc_inval_ensure_handler (); #endif
--- a/tests/test-fwrite.c +++ b/tests/test-fwrite.c @@ -37,7 +37,8 @@ /* We don't have an fwrite() function that installs an invalid parameter handler so far. So install that handler here, explicitly. */ -#if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING +#if HAVE_MSVC_INVALID_PARAMETER_HANDLER \ + && MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING gl_msvc_inval_ensure_handler (); #endif