diff options
author | Andy Wingo <wingo@pobox.com> | 2012-01-30 18:25:07 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-01-30 18:25:07 +0100 |
commit | 855db1905d56efcdf91ae51a9e80990f79030eae (patch) | |
tree | 9c918dba899ddae458147ce1095018fcbdec18b0 /libguile/filesys.c | |
parent | 91ee7515da0bad91330ce5c87b250d6cf12a2789 (diff) | |
parent | 9b0975f1dc41ddd10d81fb5b0965b9e9a54ef37a (diff) | |
download | guile-855db1905d56efcdf91ae51a9e80990f79030eae.tar.gz |
Merge commit '9b0975f1dc41ddd10d81fb5b0965b9e9a54ef37a'
Conflicts:
libguile/foreign.c
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm
Diffstat (limited to 'libguile/filesys.c')
-rw-r--r-- | libguile/filesys.c | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/libguile/filesys.c b/libguile/filesys.c index 3856b4412..63e5a206b 100644 --- a/libguile/filesys.c +++ b/libguile/filesys.c @@ -1,5 +1,6 @@ -/* Copyright (C) 1996,1997,1998,1999,2000,2001, 2002, 2004, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. - * +/* Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2006, + * 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License * as published by the Free Software Foundation; either version 3 of @@ -96,23 +97,9 @@ #include <pwd.h> #endif +#include <dirent.h> -#if HAVE_DIRENT_H -# include <dirent.h> -# define NAMLEN(dirent) strlen((dirent)->d_name) -#else -# define dirent direct -# define NAMLEN(dirent) (dirent)->d_namlen -# if HAVE_SYS_NDIR_H -# include <sys/ndir.h> -# endif -# if HAVE_SYS_DIR_H -# include <sys/dir.h> -# endif -# if HAVE_NDIR_H -# include <ndir.h> -# endif -#endif +#define NAMLEN(dirent) strlen ((dirent)->d_name) /* Some more definitions for the native Windows port. */ #ifdef __MINGW32__ @@ -121,15 +108,6 @@ # define fchmod(fd, mode) (-1) #endif /* __MINGW32__ */ -/* dirfd() returns the file descriptor underlying a "DIR*" directory stream. - Found on MacOS X for instance. The following definition is for Solaris - 10, it's probably not right elsewhere, but that's ok, it shouldn't be - used elsewhere. Crib note: If we need more then gnulib has a dirfd.m4 - figuring out how to get the fd (dirfd function, dirfd macro, dd_fd field, - or d_fd field). */ -#ifndef dirfd -#define dirfd(dirstream) ((dirstream)->dd_fd) -#endif |