From 794397ae1d1c6d33d11a9b0951a420c2082bcd6c Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Wed, 2 Jan 2013 20:34:08 +0100 Subject: Move tar function headers to pgtar.h This makes it possible to include them only where they are used, so we can avoid the conflict of the uid_t and gid_t datatypes that happened in plperl (since plperl doesn't need the tar functions) --- src/include/pgtar.h | 15 +++++++++++++++ src/include/port.h | 4 ---- 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 src/include/pgtar.h (limited to 'src/include') diff --git a/src/include/pgtar.h b/src/include/pgtar.h new file mode 100644 index 00000000000..ec8f681b1b8 --- /dev/null +++ b/src/include/pgtar.h @@ -0,0 +1,15 @@ +/*------------------------------------------------------------------------- + * + * pgtar.h + * Functions for manipulating tarfile datastructures (src/port/tar.c) + * + * + * Portions Copyright (c) 1996-2013, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * src/include/pgtar.h + * + *------------------------------------------------------------------------- + */ +extern void tarCreateHeader(char *h, const char *filename, const char *linktarget, size_t size, mode_t mode, uid_t uid, gid_t gid, time_t mtime); +extern int tarChecksum(char *header); diff --git a/src/include/port.h b/src/include/port.h index 6085cd2bb7a..b6092c6fda8 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -465,8 +465,4 @@ extern int pg_check_dir(const char *dir); /* port/pgmkdirp.c */ extern int pg_mkdir_p(char *path, int omode); -/* port/tar.c */ -void tarCreateHeader(char *h, const char *filename, const char *linktarget, size_t size, mode_t mode, uid_t uid, gid_t gid, time_t mtime); -int tarChecksum(char *header); - #endif /* PG_PORT_H */ -- cgit v1.2.3