Merge branch 'upstream' into dfsg-orig

[tar] / lib / close-stream.h

#include <stdio.h>
int close_stream (FILE *stream);