From a970c8f1fc3baa890dbf872a444781b84d6ef865 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 29 Dec 2016 10:38:37 -0800 Subject: [PATCH] Make libziparchive C++-only. If we're going to build libziparchive with _FILE_OFFSET_BITS=64, which seems like a reasonable idea, we don't want off_t/off64_t mixups in the ABI, and C++ name mangling helps protect against that where C wouldn't. Bug: N/A Test: builds Change-Id: I5f068b41fb4cd9e1e055e5250054318b35bcbc08 --- include/ziparchive/zip_archive.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/ziparchive/zip_archive.h b/include/ziparchive/zip_archive.h index 54946fc93..31fc2dfc9 100644 --- a/include/ziparchive/zip_archive.h +++ b/include/ziparchive/zip_archive.h @@ -26,8 +26,6 @@ #include #include -__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_