Adding upstream version 1.18~pre1.upstream/1.18_pre1

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 2 insertions, 2 deletions

diff --git a/merge.cc b/merge.cc
index b2249e6..75faf07 100644
--- a/merge.cc
+++ b/merge.cc
@@ -480,12 +480,12 @@ int merge_files( const std::vector< std::string > & filenames,
       {
       done = try_merge_member( mpos, msize, block_vector, color_vector,
                                infd_vector, output_filename, outfd, verbosity );
-      if( !done && verbosity >= 1 ) std::fputs( "\n", stdout );
+      if( !done && verbosity >= 1 ) std::fputc( '\n', stdout );
       }
     if( !done )
       done = try_merge_member1( mpos, msize, block_vector, color_vector,
                                 infd_vector, output_filename, outfd, verbosity );
-    if( verbosity >= 1 ) std::fputs( "\n", stdout );
+    if( verbosity >= 1 ) std::fputc( '\n', stdout );
     if( !done )
       {
       if( verbosity >= 2 )