diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:21:20 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:21:20 +0000 |
| commit | 0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (patch) | |
| tree | 6709ddd6071a9c238ba69233540bbcfe560c6a44 /include/mingw.h | |
| parent | 67758035a4fe040c6ac69b39d61bcd6bddd7b827 (diff) | |
| parent | 56a3b82e9692a25ef9c9269e88feac0d579ce8e8 (diff) | |
| download | busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.tar.gz busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.tar.bz2 busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.zip | |
Merge commit '56a3b82e9692a25ef9c9269e88feac0d579ce8e8' into merge
Conflicts:
coreutils/ls.c
include/platform.h
libbb/bb_basename.c
Diffstat (limited to 'include/mingw.h')
| -rw-r--r-- | include/mingw.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mingw.h b/include/mingw.h index 49de6cb5e..69bf05574 100644 --- a/include/mingw.h +++ b/include/mingw.h | |||
| @@ -209,6 +209,8 @@ NOIMPL(mingw_bind,SOCKET s UNUSED_PARAM,const struct sockaddr* sa UNUSED_PARAM,i | |||
| 209 | /* | 209 | /* |
| 210 | * sys/stat.h | 210 | * sys/stat.h |
| 211 | */ | 211 | */ |
| 212 | typedef int nlink_t; | ||
| 213 | |||
| 212 | #define S_ISUID 04000 | 214 | #define S_ISUID 04000 |
| 213 | #define S_ISGID 02000 | 215 | #define S_ISGID 02000 |
| 214 | #define S_ISVTX 01000 | 216 | #define S_ISVTX 01000 |