Reflect the renamings.

[gnulib.git] / lib / file-type.h

diff --git a/lib/file-type.h b/lib/file-type.h
index 765ec89..502f091 100644 (file)
--- a/lib/file-type.h
+++ b/lib/file-type.h
@@ -1,6 +1,6 @@
 /* Return a string describing the type of a file.
 
-   Copyright (C) 1993, 1994, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,16 +18,11 @@
 
 /* Written by Paul Eggert and Jim Meyering.  */
 
-/* Include <sys/types.h> and <sys/stat.h> before including this
-   file.  */
-
 #ifndef FILE_TYPE_H
 # define FILE_TYPE_H 1
 
-# if 2 <= __GLIBC__ && 2 <= __GLIBC_MINOR__
-#  if !defined _SYS_STAT_H || !defined _SYS_TYPES_H
-you must include <sys/types.h> and <sys/stat.h> before including this file
-#  endif
+# if ! defined S_ISREG && ! defined S_IFREG
+you must include <sys/stat.h> before including this file
 # endif
 
 char const *file_type (struct stat const *);
@@ -143,6 +138,15 @@ char const *file_type (struct stat const *);
 # endif
 
 
+# ifndef S_TYPEISMQ
+#  define S_TYPEISMQ(p) 0
+# endif
+
+# ifndef S_TYPEISTMO
+#  define S_TYPEISTMO(p) 0
+# endif
+
+
 # ifndef S_TYPEISSEM
 #  ifdef S_INSEM
 #   define S_TYPEISSEM(p) (S_ISNAM ((p)->st_mode) && (p)->st_rdev == S_INSEM)
@@ -159,8 +163,4 @@ char const *file_type (struct stat const *);
 #  endif
 # endif
 
-# ifndef S_TYPEISMQ
-#  define S_TYPEISMQ(p) 0
-# endif
-
 #endif /* FILE_TYPE_H */