]> Savannah Git Hosting - gnulib.git/commitdiff
fgetc, fputc, fread, fwrite tests: Fix link error.
authorBruno Haible <bruno@clisp.org>
Wed, 28 Sep 2011 08:57:32 +0000 (10:57 +0200)
committerBruno Haible <bruno@clisp.org>
Wed, 28 Sep 2011 08:57:32 +0000 (10:57 +0200)
* 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
tests/test-fgetc.c
tests/test-fputc.c
tests/test-fread.c
tests/test-fwrite.c

index db2e2b0283af6b9064710e3df21f1026cc6fdaec..349bb17a4f677318ada257dc48c1decde5a0e8c8 100644 (file)
--- 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.
index 4cc7c97320ab200136c32572999b802ec1fab18b..4df46fb6e3f2d706f75da8fa3a649dc4588e5a0d 100644 (file)
@@ -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
 
index 6e009d85d238d800f3164e6b742ca0c6cd168034..03a371627c7ab906cc77159985148617577af461 100644 (file)
@@ -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
 
index a1d1ff7b366b4e85a8725fb392efe400bd29d9fd..e205c9e6ec203fe2b50e5efd0fbc340c1c51ec41 100644 (file)
@@ -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
 
index f6699ebad54f9d40a24579b4f2134406c6365dff..76ed05c5ef784f5c34395e3f21f39a3fd17563e8 100644 (file)
@@ -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