Remove unnecessary 'extern "C"' from private headers.

Correct include guard in archive_windows.h

SVN-Revision: 1264

diff --git a/cpio/cpio_windows.h b/cpio/cpio_windows.h
index 6587dcd452a9034cb42fd8c3d6f404c0d026a413..7f6f8ed82c099e155e97a2533c4a908cf644629a 100644 (file)
--- 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 c1bff32a847317f304f941278c153e1634730ba2..cbbb1b8f9612ee66574597b70b4c6134f43150c9 100644 (file)
--- 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 fa59be8f7b5503b87445e51666c4de174194863c..065e58257a4c5fea6560063819cb61bc0fb6adb0 100644 (file)
--- 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 */