projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openat-safer: new module
[gnulib.git]
/
lib
/
stdio-write.c
diff --git
a/lib/stdio-write.c
b/lib/stdio-write.c
index
1bd1be2
..
15cc5ed
100644
(file)
--- a/
lib/stdio-write.c
+++ b/
lib/stdio-write.c
@@
-1,5
+1,5
@@
/* POSIX compatible FILE stream write function.
/* POSIX compatible FILE stream write function.
- Copyright (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 2008
-2009
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2008.
This program is free software: you can redistribute it and/or modify
Written by Bruno Haible <bruno@clisp.org>, 2008.
This program is free software: you can redistribute it and/or modify
@@
-49,7
+49,8
@@
if (FAILED && GetLastError () == ERROR_NO_DATA && ferror (stream)) \
{ \
int fd = fileno (stream); \
if (FAILED && GetLastError () == ERROR_NO_DATA && ferror (stream)) \
{ \
int fd = fileno (stream); \
- if (fd >= 0 && GetFileType (_get_osfhandle (fd)) == FILE_TYPE_PIPE) \
+ if (fd >= 0 \
+ && GetFileType ((HANDLE) _get_osfhandle (fd)) == FILE_TYPE_PIPE)\
{ \
/* Try to raise signal SIGPIPE. */ \
raise (SIGPIPE); \
{ \
/* Try to raise signal SIGPIPE. */ \
raise (SIGPIPE); \
@@
-62,6
+63,7
@@
}
# if !REPLACE_PRINTF_POSIX /* avoid collision with printf.c */
}
# if !REPLACE_PRINTF_POSIX /* avoid collision with printf.c */
+# if !DEPENDS_ON_LIBINTL /* avoid collision with intl/printf.c */
int
printf (const char *format, ...)
{
int
printf (const char *format, ...)
{
@@
-74,6
+76,7
@@
printf (const char *format, ...)
return retval;
}
return retval;
}
+# endif
# endif
# if !REPLACE_FPRINTF_POSIX /* avoid collision with fprintf.c */
# endif
# if !REPLACE_FPRINTF_POSIX /* avoid collision with fprintf.c */
@@
-91,7
+94,7
@@
fprintf (FILE *stream, const char *format, ...)
}
# endif
}
# endif
-# if !REPLACE_V
F
PRINTF_POSIX /* avoid collision with vprintf.c */
+# if !REPLACE_VPRINTF_POSIX /* avoid collision with vprintf.c */
int
vprintf (const char *format, va_list args)
{
int
vprintf (const char *format, va_list args)
{
@@
-99,7
+102,7
@@
vprintf (const char *format, va_list args)
}
# endif
}
# endif
-# if !REPLACE_VPRINTF_POSIX /* avoid collision with vfprintf.c */
+# if !REPLACE_V
F
PRINTF_POSIX /* avoid collision with vfprintf.c */
int
vfprintf (FILE *stream, const char *format, va_list args)
#undef vfprintf
int
vfprintf (FILE *stream, const char *format, va_list args)
#undef vfprintf