diff options
| author | Charles Wilson <cwilso11@gmail.com> | 2009-07-22 08:13:50 -0400 |
|---|---|---|
| committer | Charles Wilson <cwilso11@gmail.com> | 2009-07-22 08:13:50 -0400 |
| commit | dfb8fc79c40387dd481cade1dbddb307667beef5 (patch) | |
| tree | f8fa905ae5a47cfcc0819ea83756e79f7dc9b8ef | |
| parent | 6029e437ee4982eeb3adf35ee563690d3418e6d1 (diff) | |
| download | libarchive-dfb8fc79c40387dd481cade1dbddb307667beef5.tar.gz | |
Remove unnecessary 'extern "C"' from private headers.
Correct include guard in archive_windows.h
SVN-Revision: 1264
| -rw-r--r-- | cpio/cpio_windows.h | 8 | ||||
| -rw-r--r-- | libarchive/archive_windows.h | 14 | ||||
| -rw-r--r-- | tar/bsdtar_windows.h | 8 |
3 files changed, 3 insertions, 27 deletions
diff --git a/cpio/cpio_windows.h b/cpio/cpio_windows.h index 6587dcd4..7f6f8ed8 100644 --- a/cpio/cpio_windows.h +++ b/cpio/cpio_windows.h @@ -48,14 +48,6 @@ struct group { gid_t gr_gid; }; -#ifdef __cplusplus -extern "C" { -#endif - extern unsigned int sleep(unsigned int seconds); -#ifdef __cplusplus -} -#endif - #endif /* CPIO_WINDOWS_H */ diff --git a/libarchive/archive_windows.h b/libarchive/archive_windows.h index c1bff32a..cbbb1b8f 100644 --- a/libarchive/archive_windows.h +++ b/libarchive/archive_windows.h @@ -27,8 +27,8 @@ * $FreeBSD$ */ -#ifndef LIBARCHIVE_NONPOSIX_H_INCLUDED -#define LIBARCHIVE_NONPOSIX_H_INCLUDED +#ifndef LIBARCHIVE_ARCHIVE_WINDOWS_H_INCLUDED +#define LIBARCHIVE_ARCHIVE_WINDOWS_H_INCLUDED /* Start of configuration for native Win32 */ @@ -302,10 +302,6 @@ typedef struct { /* End of Win32 definitions. */ -#ifdef __cplusplus -extern "C" { -#endif - /* Implementation POSIX function */ extern int link (const char *from, const char *to); extern int symlink (const char *from, const char *to); @@ -388,8 +384,4 @@ extern void SHA512_Final(unsigned char buf[SHA512_DIGEST_LENGTH], #endif #endif -#ifdef __cplusplus -} -#endif - -#endif /* LIBARCHIVE_NONPOSIX_H_INCLUDED */ +#endif /* LIBARCHIVE_ARCHIVE_WINDOWS_H_INCLUDED */ diff --git a/tar/bsdtar_windows.h b/tar/bsdtar_windows.h index fa59be8f..065e5825 100644 --- a/tar/bsdtar_windows.h +++ b/tar/bsdtar_windows.h @@ -41,10 +41,6 @@ struct direct { char d_name[MAX_PATH]; }; -#ifdef __cplusplus -extern "C" { -#endif - struct bsdtar; struct archive; @@ -57,8 +53,4 @@ extern void write_hierarchy_win(struct bsdtar *bsdtar, struct archive *a, void (*write_hierarchy)(struct bsdtar *bsdtar, struct archive *a, const char *path)); -#ifdef __cplusplus -} -#endif - #endif /* BSDTAR_WINDOWS_H */ |