aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sys_stat.in.h
diff options
context:
space:
mode:
authorPaul Eggert2011-09-26 14:30:18 -0700
committerPaul Eggert2011-09-26 14:30:18 -0700
commit316f8af0092ff66f564fd3052d2e35baa9a5817f (patch)
treed7800fbc711a63baa306a4279caa9e294cae8529 /lib/sys_stat.in.h
parentec9da8404b5f400bd4a09d16490de69d4983bf52 (diff)
downloademacs-316f8af0092ff66f564fd3052d2e35baa9a5817f.tar.gz
emacs-316f8af0092ff66f564fd3052d2e35baa9a5817f.zip
Merge from gnulib, improving some licensing wording.
This clarifies and fixes some licensing issues raised by Glenn Morris <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00397.html>. It also merges the latest version of texinfo.tex and has some MSVC-related changes that don't affect Emacs. * Makefile.in (GNULIB_TOOL_FLAGS): Avoid msvc-inval, msvc-nothrow, pathmax, and raise, since these are needed only to address MSVC-related issues that Emacs doesn't have. * doc/misc/texinfo.tex, lib/dup2.c, lib/gnulib.mk, lib/signal.in.h: * lib/sigprocmask.c, lib/stat.c, lib/stdio.in.h, lib/sys_stat.in.h: * lib/unistd.in.h, m4/dup2.m4, m4/getloadavg.m4, m4/gl-comp.m4: * m4/include_next.m4, m4/signal_h.m4, m4/signalblocking.m4: * m4/stdint.m4, m4/stdio_h.m4, m4/sys_stat_h.m4, m4/time_h.m4: * m4/unistd_h.m4: Merge from gnulib.
Diffstat (limited to 'lib/sys_stat.in.h')
-rw-r--r--lib/sys_stat.in.h32
1 files changed, 24 insertions, 8 deletions
diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h
index 5acee705f8a..77a7177ca64 100644
--- a/lib/sys_stat.in.h
+++ b/lib/sys_stat.in.h
@@ -55,10 +55,17 @@
55/* The definition of _GL_WARN_ON_USE is copied here. */ 55/* The definition of _GL_WARN_ON_USE is copied here. */
56 56
57/* Before doing "#define mkdir rpl_mkdir" below, we need to include all 57/* Before doing "#define mkdir rpl_mkdir" below, we need to include all
58 headers that may declare mkdir(). */ 58 headers that may declare mkdir(). Native Windows platforms declare mkdir
59 in <io.h> and/or <direct.h>, not in <unistd.h>. */
59#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ 60#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
60# include <io.h> /* mingw32, mingw64 */ 61# include <io.h> /* mingw32, mingw64 */
61# include <direct.h> /* mingw64 */ 62# include <direct.h> /* mingw64, MSVC 9 */
63#endif
64
65#ifndef S_IFIFO
66# ifdef _S_IFIFO
67# define S_IFIFO _S_IFIFO
68# endif
62#endif 69#endif
63 70
64#ifndef S_IFMT 71#ifndef S_IFMT
@@ -312,16 +319,25 @@ _GL_WARN_ON_USE (fchmodat, "fchmodat is not portable - "
312#endif 319#endif
313 320
314 321
315#if @REPLACE_FSTAT@ 322#if @GNULIB_FSTAT@
316# if !(defined __cplusplus && defined GNULIB_NAMESPACE) 323# if @REPLACE_FSTAT@
317# define fstat rpl_fstat 324# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
318# endif 325# undef fstat
326# define fstat rpl_fstat
327# endif
319_GL_FUNCDECL_RPL (fstat, int, (int fd, struct stat *buf) _GL_ARG_NONNULL ((2))); 328_GL_FUNCDECL_RPL (fstat, int, (int fd, struct stat *buf) _GL_ARG_NONNULL ((2)));
320_GL_CXXALIAS_RPL (fstat, int, (int fd, struct stat *buf)); 329_GL_CXXALIAS_RPL (fstat, int, (int fd, struct stat *buf));
321#else 330# else
322_GL_CXXALIAS_SYS (fstat, int, (int fd, struct stat *buf)); 331_GL_CXXALIAS_SYS (fstat, int, (int fd, struct stat *buf));
323#endif 332# endif
324_GL_CXXALIASWARN (fstat); 333_GL_CXXALIASWARN (fstat);
334#elif defined GNULIB_POSIXCHECK
335# undef fstat
336# if HAVE_RAW_DECL_FSTAT
337_GL_WARN_ON_USE (fstat, "fstat has portability problems - "
338 "use gnulib module fstat for portability");
339# endif
340#endif
325 341
326 342
327#if @GNULIB_FSTATAT@ 343#if @GNULIB_FSTATAT@