commit fe94a0ea1f3cf534e4a472d49e80a30a333f1178
author Elliott Hughes <enh@google.com> Fri Dec 30 20:02:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 30 20:02:08 2016 +0000
tree 66019195073d5d6da576f5ce59cc324389a4b06a
parent 5e2417f837e878ae4647764c3b08b5f28985ebbb
parent 7c859c82a6ab38ce6de68d7da4bb1b621ceacaae

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

Change-Id: I748dfc6bfdf7430a3eda94624258d48b253310b9

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_