diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-12-15 20:14:02 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-12-15 20:14:19 +0100 |
commit | 1cd4fffcde4edd4853e039da9a42e0972d851a51 (patch) | |
tree | 82c1f750fd5acf88414b85a421c7b7212d9efcfc /libguile/filesys.c | |
parent | 20ccae8dbb8d92a6a32e0275c517f70961c6b833 (diff) | |
download | guile-1cd4fffcde4edd4853e039da9a42e0972d851a51.tar.gz |
Use Gnulib's `sys_stat' module; update Gnulib.
* .x-sc_prohibit_S_IS_definition: New file.
* m4/gnulib-cache.m4: Add `sys_stat'.
* libguile/filesys.c: Remove `S_IS*' macro definitions for Ultrix and
MinGW.
Diffstat (limited to 'libguile/filesys.c')
-rw-r--r-- | libguile/filesys.c | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/libguile/filesys.c b/libguile/filesys.c index 02f2da632..3a2a47ed1 100644 --- a/libguile/filesys.c +++ b/libguile/filesys.c @@ -115,69 +115,6 @@ # endif #endif -/* Ultrix has S_IFSOCK, but no S_ISSOCK. Ipe! */ -#if defined (S_IFSOCK) && ! defined (S_ISSOCK) -#define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK) -#endif - -/* The MinGW gcc does not define the S_ISSOCK macro. Any other native Windows - compiler like BorlandC or MSVC has none of these macros defined. */ -#ifdef __MINGW32__ - -# ifdef _S_IFIFO -# undef _S_IFIFO -# endif -# ifdef _S_IFCHR -# undef _S_IFCHR -# endif -# ifdef _S_IFBLK -# undef _S_IFBLK -# endif -# ifdef _S_IFDIR -# undef _S_IFDIR -# endif -# ifdef _S_IFREG -# undef _S_IFREG -# endif -# ifdef _S_IFSOCK -# undef _S_IFSOCK -# endif - -# define _S_IFIFO 0x1000 /* FIFO */ -# define _S_IFCHR 0x2000 /* Character */ -# define _S_IFBLK 0x3000 /* Block */ -# define _S_IFDIR 0x4000 /* Directory */ -# define _S_IFREG 0x8000 /* Regular */ -# define _S_IFSOCK 0xC000 /* Socket */ - -# ifdef S_ISBLK -# undef S_ISBLK -# endif -# ifdef S_ISFIFO -# undef S_ISFIFO -# endif -# ifdef S_ISCHR -# undef S_ISCHR -# endif -# ifdef S_ISDIR -# undef S_ISDIR -# endif -# ifdef S_ISREG -# undef S_ISREG -# endif -# ifdef S_ISSOCK -# undef S_ISSOCK -# endif - -# define S_ISBLK(mode) (((mode) & _S_IFMT) == _S_IFBLK) -# define S_ISFIFO(mode) (((mode) & _S_IFMT) == _S_IFIFO) -# define S_ISCHR(mode) (((mode) & _S_IFMT) == _S_IFCHR) -# define S_ISDIR(mode) (((mode) & _S_IFMT) == _S_IFDIR) -# define S_ISREG(mode) (((mode) & _S_IFMT) == _S_IFREG) -# define S_ISSOCK(mode) (((mode) & _S_IFMT) == _S_IFSOCK) - -#endif /* __MINGW32__ */ - /* Some more definitions for the native Windows port. */ #ifdef __MINGW32__ # define mkdir(path, mode) mkdir (path) |