From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sun, 7 Sep 2014 11:58:28 +0000 (+0900)
Subject: Rename archive_hmac.h archive_hmac_private.h
X-Git-Tag: v3.1.900a~229
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e317cc0ed27f9b63b6c03469ada89e88079db966;p=thirdparty%2Flibarchive.git

Rename archive_hmac.h archive_hmac_private.h
---

diff --git a/Makefile.am b/Makefile.am
index c45dfe598..2d2521a2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,7 +113,7 @@ libarchive_la_SOURCES= \
 	libarchive/archive_entry_xattr.c \
 	libarchive/archive_getdate.c \
 	libarchive/archive_hmac.c \
-	libarchive/archive_hmac.h \
+	libarchive/archive_hmac_private.h \
 	libarchive/archive_match.c \
 	libarchive/archive_options.c \
 	libarchive/archive_options_private.h \
diff --git a/libarchive/archive_hmac.c b/libarchive/archive_hmac.c
index 0f673f7ce..34ce7d49b 100644
--- a/libarchive/archive_hmac.c
+++ b/libarchive/archive_hmac.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #endif
 #include "archive.h"
-#include "archive_hmac.h"
+#include "archive_hmac_private.h"
 
 #ifdef __APPLE__
 
diff --git a/libarchive/archive_hmac.h b/libarchive/archive_hmac_private.h
similarity index 95%
rename from libarchive/archive_hmac.h
rename to libarchive/archive_hmac_private.h
index 41fab0ecc..3b296375d 100644
--- a/libarchive/archive_hmac.h
+++ b/libarchive/archive_hmac_private.h
@@ -27,8 +27,8 @@
 #error This header is only to be used internally to libarchive.
 #endif
 
-#ifndef ARCHIVE_HMAC_H_INCLUDED
-#define ARCHIVE_HMAC_H_INCLUDED
+#ifndef ARCHIVE_HMAC_PRIVATE_H_INCLUDED
+#define ARCHIVE_HMAC_PRIVATE_H_INCLUDED
 
 #ifdef __APPLE__
 #include <CommonCrypto/CommonHMAC.h>
@@ -68,4 +68,4 @@ struct archive_hmac {
 };
 
 extern const struct archive_hmac __archive_hmac;
-#endif /* ARCHIVE_HMAC_H_INCLUDED */
+#endif /* ARCHIVE_HMAC_PRIVATE_H_INCLUDED */
diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
index 46d8c2fff..a3c3564dd 100644
--- a/libarchive/archive_read_support_format_zip.c
+++ b/libarchive/archive_read_support_format_zip.c
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_zip.c 201102
 #include "archive_endian.h"
 #include "archive_entry.h"
 #include "archive_entry_locale.h"
-#include "archive_hmac.h"
+#include "archive_hmac_private.h"
 #include "archive_private.h"
 #include "archive_rb.h"
 #include "archive_read_private.h"