X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffts_.h;h=6a22becac47dae9fdbe7094fdf604a9009b7446b;hb=4a1579d7560659ef5723325726eda14490a967f6;hp=b2593fef79b3f50f2e244adbc55dc2a443d40ee4;hpb=441aa3044f43e5572f58c354f01e6bc070acd5c7;p=gnulib.git

diff --git a/lib/fts_.h b/lib/fts_.h
index b2593fef7..6a22becac 100644
--- a/lib/fts_.h
+++ b/lib/fts_.h
@@ -1,6 +1,6 @@
 /* Traverse a file hierarchy.
 
-   Copyright (C) 2004-2009 Free Software Foundation, Inc.
+   Copyright (C) 2004-2011 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
@@ -55,9 +55,14 @@
 #  undef __THROW
 #  define __THROW
 #  undef __BEGIN_DECLS
-#  define __BEGIN_DECLS
 #  undef __END_DECLS
-#  define __END_DECLS
+#  ifdef __cplusplus
+#   define __BEGIN_DECLS extern "C" {
+#   define __END_DECLS }
+#  else
+#   define __BEGIN_DECLS
+#   define __END_DECLS
+#  endif
 # endif
 
 # include <stddef.h>
@@ -143,7 +148,6 @@ typedef struct {
 # define FTS_STOP       0x2000          /* (private) unrecoverable error */
         int fts_options;                /* fts_open options, global flags */
 
-# if GNULIB_FTS
         /* Map a directory's device number to a boolean.  The boolean is
            true if for that file system (type determined by a single fstatfs
            call per FS) st_nlink can be used to calculate the number of
@@ -175,7 +179,6 @@ typedef struct {
                 struct cycle_check_state *state;
         } fts_cycle;
 
-# endif
         /* A stack of the file descriptors corresponding to the
            most-recently traversed parent directories.
            Currently used only in FTS_CWDFD mode.  */