Merge branch 'dfsg-orig' into dfsg-debian

[debian/tar] / gnu / getcwd.c

diff --git a/gnu/getcwd.c b/gnu/getcwd.c
index 22ba534ed3beed0b20fa200d3754f2a985956dc4..db5279dba10a1eac065cc484ca0c1a8d97658db5 100644 (file)
--- a/gnu/getcwd.c
+++ b/gnu/getcwd.c
@@ -1,6 +1,4 @@
-/* -*- buffer-read-only: t -*- vi: set ro: */
-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
-/* Copyright (C) 1991-1999, 2004-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1999, 2004-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
@@ -95,8 +93,12 @@
    FIXME - if the kernel ever adds support for multi-thread safety for
    avoiding standard fds, then we should use opendir_safer and
    openat_safer.  */
-#undef opendir
-#undef closedir
+#ifdef GNULIB_defined_opendir
+# undef opendir
+#endif
+#ifdef GNULIB_defined_closedir
+# undef closedir
+#endif
 \f
 /* Get the name of the current working directory, and put it in SIZE
    bytes of BUF.  Returns NULL if the directory couldn't be determined or