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

am: b7c94f3e50 Change-Id: I4776d56008693b1bc05695c7826e791a9d81b197
2016-12-30 19:54:07 +00:00 · 2016-12-30 19:54:07 +00:00 · 8f378bc31e
parent c6b59d9d8a b7c94f3e50
commit 8f378bc31e
1 changed files with 0 additions and 4 deletions
--- 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 @@ int32_t ProcessZipEntryContents(ZipArchiveHandle handle, ZipEntry* entry,
        ProcessZipEntryFunction func, void* cookie);
 #endif

-__END_DECLS
-
 #endif  // LIBZIPARCHIVE_ZIPARCHIVE_H_