Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3755)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/zip_internal.h

Issue 11214002: Linux: add an option to use system minizip. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes for clang etc Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/zip.cc ('k') | chrome/common/zip_internal.cc » ('j') | third_party/zlib/zlib.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/zip_internal.h
diff --git a/chrome/common/zip_internal.h b/chrome/common/zip_internal.h
index 11881a68dea217b138ce8ccb45dd476da7046ead..3bf8683c392036deb2bd291848a212c0989440af 100644
--- a/chrome/common/zip_internal.h
+++ b/chrome/common/zip_internal.h
@@ -7,8 +7,13 @@
#include <string>
+#if defined(USE_SYSTEM_MINIZIP)
+#include <minizip/unzip.h>
+#include <minizip/zip.h>
+#else
#include "third_party/zlib/contrib/minizip/unzip.h"
#include "third_party/zlib/contrib/minizip/zip.h"
+#endif
// Utility functions and constants used internally for the zip file
// library in the directory. Don't use them outside of the library.
« no previous file with comments | « chrome/common/zip.cc ('k') | chrome/common/zip_internal.cc » ('j') | third_party/zlib/zlib.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698