From bd35a4e10e52b9fbe25b7280c3c4d9ef4b144c8a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 28 Sep 2011 10:57:32 +0200 Subject: [PATCH] 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. --- ChangeLog | 10 ++++++++++ tests/test-fgetc.c | 5 +++-- tests/test-fputc.c | 3 ++- tests/test-fread.c | 3 ++- tests/test-fwrite.c | 3 ++- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index db2e2b028..349bb17a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2011-09-28 Bruno Haible + + 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 fputc, fwrite tests: Avoid test failure on MSVC. diff --git a/tests/test-fgetc.c b/tests/test-fgetc.c index 4cc7c9732..4df46fb6e 100644 --- a/tests/test-fgetc.c +++ b/tests/test-fgetc.c @@ -35,9 +35,10 @@ main (int argc, char **argv) { 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 diff --git a/tests/test-fputc.c b/tests/test-fputc.c index 6e009d85d..03a371627 100644 --- a/tests/test-fputc.c +++ b/tests/test-fputc.c @@ -37,7 +37,8 @@ main (int argc, char **argv) /* 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 diff --git a/tests/test-fread.c b/tests/test-fread.c index a1d1ff7b3..e205c9e6e 100644 --- a/tests/test-fread.c +++ b/tests/test-fread.c @@ -37,7 +37,8 @@ main (int argc, char **argv) /* 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 diff --git a/tests/test-fwrite.c b/tests/test-fwrite.c index f6699ebad..76ed05c5e 100644 --- a/tests/test-fwrite.c +++ b/tests/test-fwrite.c @@ -37,7 +37,8 @@ main (int argc, char **argv) /* 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 -- 2.11.0