gettimeofday: port recent C++ fix to Emacs

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

diff --git a/lib/file-type.c b/lib/file-type.c
index c4ccf0b..0d54269 100644 (file)
--- a/lib/file-type.c
+++ b/lib/file-type.c
@@ -1,10 +1,12 @@
-/* return a string describing the type of a file
-   Copyright (C) 2002 Free Software Foundation, Inc.
+/* Return a string describing the type of a file.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 1993-1994, 2001-2002, 2004-2006, 2009-2013 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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,24 +14,22 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Paul Eggert.  */
 
-/* Extracted from diffutils/src/diff.c.  */
+#include <config.h>
 
 #include "file-type.h"
 
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(text) gettext (text)
-#else
-# define _(text) text
-#endif
+#include <gettext.h>
+#define _(text) gettext (text)
 
 char const *
 file_type (struct stat const *st)
 {
-  /* See POSIX 1003.1-2001 for these formats.
+  /* See POSIX 1003.1-2001 XCU Table 4-8 lines 17093-17107 for some of
+     these formats.
 
      To keep diagnostics grammatical in English, the returned string
      must start with a consonant.  */
@@ -64,5 +64,8 @@ file_type (struct stat const *st)
   if (S_TYPEISSHM (st))
     return _("shared memory object");
 
+  if (S_TYPEISTMO (st))
+    return _("typed memory object");
+
   return _("weird file");
 }