setenv: Avoid gcc warning.

[gnulib.git] / lib / fts_.h

diff --git a/lib/fts_.h b/lib/fts_.h
index b2593fe..6a22bec 100644 (file)
--- 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.  */