diff options
| author | Kenny Root <kroot@google.com> | 2012-03-30 20:48:34 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2012-03-30 21:26:01 -0700 |
| commit | 41dda82d847ae8c261b09c383806b412d680f935 (patch) | |
| tree | 98edeec4fa5d9df2d0104624d66b1608cecdaf50 /minzip/Zip.h | |
| parent | b2364342a05a689bc302bfcd7d5d15f528eb772c (diff) | |
| parent | 0b1fee1b2aa7da86ffdabfe4c577ee8adb93d803 (diff) | |
| download | bootable_recovery-41dda82d847ae8c261b09c383806b412d680f935.zip bootable_recovery-41dda82d847ae8c261b09c383806b412d680f935.tar.gz bootable_recovery-41dda82d847ae8c261b09c383806b412d680f935.tar.bz2 | |
resolved conflicts for merge of 0b1fee1b to master
Change-Id: I2e8298ff5988a96754f56f80a5186c9605ad9928
Diffstat (limited to 'minzip/Zip.h')
| -rw-r--r-- | minzip/Zip.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/minzip/Zip.h b/minzip/Zip.h index 739dbf5..4bb9ef6 100644 --- a/minzip/Zip.h +++ b/minzip/Zip.h @@ -18,6 +18,13 @@ extern "C" { #endif +#ifdef HAVE_SELINUX +#include <selinux/selinux.h> +#include <selinux/label.h> +#else +struct selabel_handle; +#endif + /* * One entry in the Zip archive. Treat this as opaque -- use accessors below. * @@ -212,7 +219,8 @@ enum { MZ_EXTRACT_FILES_ONLY = 1, MZ_EXTRACT_DRY_RUN = 2 }; bool mzExtractRecursive(const ZipArchive *pArchive, const char *zipDir, const char *targetDir, int flags, const struct utimbuf *timestamp, - void (*callback)(const char *fn, void*), void *cookie); + void (*callback)(const char *fn, void*), void *cookie, + struct selabel_handle *sehnd); #ifdef __cplusplus } |