summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2016-12-29 12:38:37 -0600
committerElliott Hughes2016-12-29 12:38:37 -0600
commita970c8f1fc3baa890dbf872a444781b84d6ef865 (patch)
tree91a13ed0374f2c6885633c58293706712ae1b856
parent8a1c4b85303cd636f4920f99093063f57ecc8e73 (diff)
downloadplatform-system-core-a970c8f1fc3baa890dbf872a444781b84d6ef865.tar.gz
platform-system-core-a970c8f1fc3baa890dbf872a444781b84d6ef865.tar.xz
platform-system-core-a970c8f1fc3baa890dbf872a444781b84d6ef865.zip
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
-rw-r--r--include/ziparchive/zip_archive.h4
1 files changed, 0 insertions, 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 @@
26#include <sys/types.h> 26#include <sys/types.h>
27#include <utils/Compat.h> 27#include <utils/Compat.h>
28 28
29__BEGIN_DECLS
30
31/* Zip compression methods we support */ 29/* Zip compression methods we support */
32enum { 30enum {
33 kCompressStored = 0, // no compression 31 kCompressStored = 0, // no compression
@@ -228,6 +226,4 @@ int32_t ProcessZipEntryContents(ZipArchiveHandle handle, ZipEntry* entry,
228 ProcessZipEntryFunction func, void* cookie); 226 ProcessZipEntryFunction func, void* cookie);
229#endif 227#endif
230 228
231__END_DECLS
232
233#endif // LIBZIPARCHIVE_ZIPARCHIVE_H_ 229#endif // LIBZIPARCHIVE_ZIPARCHIVE_H_