Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

1 files changed, 5 insertions, 5 deletions

diff --git a/src/print.c b/src/print.c
index aaec5b04956..6bf8af9ef93 100644
--- a/src/print.c
+++ b/src/print.c
@@ -228,7 +228,7 @@ printchar_to_stream (unsigned int ch, FILE *stream)
     {
       if (ASCII_CHAR_P (ch))
         {
-          putc (ch, stream);
+          putc_unlocked (ch, stream);
 #ifdef WINDOWSNT
           /* Send the output to a debugger (nothing happens if there
              isn't one).  */
@@ -246,7 +246,7 @@ printchar_to_stream (unsigned int ch, FILE *stream)
           if (encode_p)
             encoded_ch = code_convert_string_norecord (encoded_ch,
                                                        coding_system, true);
-          fwrite (SSDATA (encoded_ch), 1, SBYTES (encoded_ch), stream);
+          fwrite_unlocked (SSDATA (encoded_ch), 1, SBYTES (encoded_ch), stream);
 #ifdef WINDOWSNT
           if (print_output_debug_flag && stream == stderr)
             OutputDebugString (SSDATA (encoded_ch));
@@ -298,7 +298,7 @@ printchar (unsigned int ch, Lisp_Object fun)
           if (DISP_TABLE_P (Vstandard_display_table))
             printchar_to_stream (ch, stdout);
           else
-            fwrite (str, 1, len, stdout);
+            fwrite_unlocked (str, 1, len, stdout);
           noninteractive_need_newline = 1;
         }
       else
@@ -350,7 +350,7 @@ strout (const char *ptr, ptrdiff_t size, ptrdiff_t size_byte,
             }
         }
       else
-        fwrite (ptr, 1, size_byte, stdout);
+        fwrite_unlocked (ptr, 1, size_byte, stdout);
 
       noninteractive_need_newline = 1;
     }
@@ -801,7 +801,7 @@ append to existing target file.  */)
         report_file_error ("Cannot open debugging output stream", file);
     }
 
-  fflush (stderr);
+  fflush_unlocked (stderr);
   if (dup2 (fd, STDERR_FILENO) < 0)
     report_file_error ("dup2", file);
   if (fd != stderr_dup)