summaryrefslogtreecommitdiffstats
path: root/minzip/Zip.h
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2012-10-17 02:49:23 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-17 02:49:23 +0200
commita0d9ddb8f2922088b08219326afeaf532b3af5ac (patch)
treec657c4603c41f1cac92c540bd5e1eb07b4b0c9ad /minzip/Zip.h
parentam d0d4d44d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge (diff)
parentresolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp (diff)
downloadandroid_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar
android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.gz
android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.bz2
android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.lz
android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.xz
android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.tar.zst
android_bootable_recovery-a0d9ddb8f2922088b08219326afeaf532b3af5ac.zip
Diffstat (limited to 'minzip/Zip.h')
-rw-r--r--minzip/Zip.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/minzip/Zip.h b/minzip/Zip.h
index 4bb9ef6a4..c94282827 100644
--- a/minzip/Zip.h
+++ b/minzip/Zip.h
@@ -18,12 +18,8 @@
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.