2 files changed, 7 insertions, 6 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 7aa13a45cba..6d50f4fa4fc 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume S_ISLNK etc. work, since gnulib supports this.
+        * etags.c (S_ISREG): Remove.
+
 2011-02-21  Paul Eggert  <eggert@cs.ucla.edu>
 
         New file "lib/min-max.h".
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 9471c0fe29f..9ca10776259 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -190,10 +190,6 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 # define assert(x) ((void) 0)
 #endif
 
-#if !defined (S_ISREG) && defined (S_IFREG)
-# define S_ISREG(m)     (((m) & S_IFMT) == S_IFREG)
-#endif
-
 #ifdef NO_LONG_OPTIONS          /* define this if you don't have GNU getopt */
 # define NO_LONG_OPTIONS TRUE
 # define getopt_long(argc,argv,optstr,lopts,lind) getopt (argc, argv, optstr)
@@ -5327,7 +5323,7 @@ prolog_skip_comment (linebuffer *plb, FILE *inf)
  */
 static int
 prolog_pr (char *s, char *last)
-             
+
                                 /* Name of last clause. */
 {
   int pos;
@@ -5484,7 +5480,7 @@ Erlang_functions (FILE *inf)
  */
 static int
 erlang_func (char *s, char *last)
-             
+
                                 /* Name of last clause. */
 {
   int pos;