commit fe21cb8b1347f7585dc6af80b29e91641e2eb98f
author Elliott Hughes <enh@google.com> Fri Dec 30 19:46:07 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 30 19:46:07 2016 +0000
tree 786d3d4b7c7967055dd61380943d261b9f7d2b7d
parent 1196f237b0c1323b20013a842eccba91d71c98fd
parent 6a17d6be9df68b16d317c5f61fbcbce778780056

Merge "Make libziparchive C++-only."
am: b175ee271b

Change-Id: Ifaa182ff77248653974e2e8a19e7f36147be47f1

include/ziparchive/zip_archive.h

diff --git a/include/ziparchive/zip_archive.h b/include/ziparchive/zip_archive.h
index 54946fc..31fc2df 100644
--- a/include/ziparchive/zip_archive.h
+++ b/include/ziparchive/zip_archive.h
@@ -26,8 +26,6 @@
 #include <sys/types.h>
 #include <utils/Compat.h>
 
-__BEGIN_DECLS
-
 /* Zip compression methods we support */
 enum {
   kCompressStored     = 0,        // no compression
@@ -228,6 +226,4 @@
         ProcessZipEntryFunction func, void* cookie);
 #endif
 
-__END_DECLS
-
 #endif  // LIBZIPARCHIVE_ZIPARCHIVE_H_