Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 478ffd46 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Make libziparchive C++-only." am: b175ee27 am: b7c94f3e 

am: 8f378bc3

Change-Id: I748dfc6bfdf7430a3eda94624258d48b253310b9
parents 44f60cbe 8f378bc3

include/ziparchive/zip_archive.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -26,8 +26,6 @@ 
#include <sys/types.h>

#include <sys/types.h>

#include <utils/Compat.h>

#include <utils/Compat.h>





__BEGIN_DECLS



/* Zip compression methods we support */

/* Zip compression methods we support */

enum {

enum {

  kCompressStored     = 0,        // no compression

  kCompressStored     = 0,        // no compression
@@ -228,6 +226,4 @@ int32_t ProcessZipEntryContents(ZipArchiveHandle handle, ZipEntry* entry, 
        ProcessZipEntryFunction func, void* cookie);

        ProcessZipEntryFunction func, void* cookie);

#endif

#endif





__END_DECLS



#endif  // LIBZIPARCHIVE_ZIPARCHIVE_H_
 
#endif  // LIBZIPARCHIVE_ZIPARCHIVE_H_