Merge branch 'upstream' into dfsg-orig

[tar] / gnu / savedir.h

diff --git a/gnu/savedir.h b/gnu/savedir.h
index ee50d80d00bf8e99c316979b8dffaee6454ec216..7ba194397fa1c3268d84b2071f8ff40fa3b34364 100644 (file)
--- a/gnu/savedir.h
+++ b/gnu/savedir.h
@@ -20,10 +20,12 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
 
-#if !defined SAVEDIR_H_
-# define SAVEDIR_H_
+#ifndef _GL_SAVEDIR_H
+#define _GL_SAVEDIR_H
 
+#include <dirent.h>
+char *streamsavedir (DIR *dirp);
 char *savedir (char const *dir);
-char *fdsavedir (int fd);
+char *fdsavedir (int fd); /* deprecated */
 
 #endif