diff options
Diffstat (limited to 'nt/inc/sys')
| -rw-r--r-- | nt/inc/sys/acl.h | 25 | ||||
| -rw-r--r-- | nt/inc/sys/socket.h | 2 | ||||
| -rw-r--r-- | nt/inc/sys/stat.h | 18 | ||||
| -rw-r--r-- | nt/inc/sys/time.h | 6 | ||||
| -rw-r--r-- | nt/inc/sys/wait.h | 2 |
5 files changed, 45 insertions, 8 deletions
diff --git a/nt/inc/sys/acl.h b/nt/inc/sys/acl.h new file mode 100644 index 00000000000..3133e3bfc09 --- /dev/null +++ b/nt/inc/sys/acl.h @@ -0,0 +1,25 @@ +/* Emulation of Posix ACLs for Windows. */ + +#ifndef ACL_H +#define ACL_H + +#define NOMINMAX 1 /* don't define min and max */ +#include <windows.h> + +typedef PSECURITY_DESCRIPTOR acl_t; +typedef unsigned acl_type_t; + +/* Values of acl_type_t */ +#define ACL_TYPE_ACCESS 0 +#define ACL_TYPE_DEFAULT 1 + +typedef unsigned acl_perm_t; + +extern int acl_valid (acl_t); +extern acl_t acl_get_file (const char *, acl_type_t); +extern int acl_set_file (const char *, acl_type_t, acl_t); +extern char * acl_to_text (acl_t, ssize_t *); +extern acl_t acl_from_text (const char *); +extern int acl_free (void *); + +#endif /* ACL_H */ diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h index 1c8be6c452f..99227d75d28 100644 --- a/nt/inc/sys/socket.h +++ b/nt/inc/sys/socket.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 2001-2012 Free Software Foundation, Inc. +/* Copyright (C) 1995, 2001-2013 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nt/inc/sys/stat.h b/nt/inc/sys/stat.h index b673b80a0e3..f6785c56477 100644 --- a/nt/inc/sys/stat.h +++ b/nt/inc/sys/stat.h @@ -1,7 +1,7 @@ /* sys/stat.h supplied with MSVCRT uses too narrow data types for inode and user/group id, so we replace them with our own. -Copyright (C) 2008-2012 Free Software Foundation, Inc. +Copyright (C) 2008-2013 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -74,6 +74,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define S_ISDOOR(m) 0 #define S_ISMPB(m) 0 #define S_ISMPC(m) 0 +#define S_ISMPX(m) 0 #define S_ISNWK(m) 0 #define S_ISPORT(m) 0 #define S_ISWHT(m) 0 @@ -98,13 +99,18 @@ struct stat { char st_gname[260]; }; +/* Internal variable for asking 'stat'/'lstat' to produce accurate + info about owner and group of files. */ +extern int w32_stat_get_owner_group; + /* Prevent redefinition by other headers, e.g. wchar.h. */ #define _STAT_DEFINED -_CRTIMP int __cdecl __MINGW_NOTHROW fstat (int, struct stat*); -_CRTIMP int __cdecl __MINGW_NOTHROW chmod (const char*, int); -_CRTIMP int __cdecl __MINGW_NOTHROW stat (const char*, struct stat*); -_CRTIMP int __cdecl __MINGW_NOTHROW lstat (const char*, struct stat*); +int __cdecl __MINGW_NOTHROW fstat (int, struct stat*); +int __cdecl __MINGW_NOTHROW stat (const char*, struct stat*); +int __cdecl __MINGW_NOTHROW lstat (const char*, struct stat*); +int __cdecl __MINGW_NOTHROW fstatat (int, char const *, + struct stat *, int); +int __cdecl __MINGW_NOTHROW chmod (const char*, int); #endif /* INC_SYS_STAT_H_ */ - diff --git a/nt/inc/sys/time.h b/nt/inc/sys/time.h index 2d2c3abe222..aa51041bcd8 100644 --- a/nt/inc/sys/time.h +++ b/nt/inc/sys/time.h @@ -6,6 +6,9 @@ * have the below stuff. */ +/* The guards are for MinGW64, which defines these structs on its + system headers which are included by ms-w32.h. */ +#ifndef _W64 /* Allow inclusion of sys/time.h and winsock2.h in any order. Needed for running the configure test, which is only relevant to MinGW. */ #ifndef _TIMEVAL_DEFINED @@ -22,12 +25,15 @@ struct timeval ((tvp)->tv_usec cmp (uvp)->tv_usec)) #define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0 #endif /* _TIMEVAL_DEFINED */ +#endif /* _W64 */ +#ifndef _TIMEZONE_DEFINED struct timezone { int tz_minuteswest; /* minutes west of Greenwich */ int tz_dsttime; /* type of dst correction */ }; +#endif void gettimeofday (struct timeval *, struct timezone *); diff --git a/nt/inc/sys/wait.h b/nt/inc/sys/wait.h index 8d890c9e175..d192453ff57 100644 --- a/nt/inc/sys/wait.h +++ b/nt/inc/sys/wait.h @@ -1,6 +1,6 @@ /* A limited emulation of sys/wait.h on Posix systems. -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2012-2013 Free Software Foundation, Inc. This file is part of GNU Emacs. |