chrome/common/zip_internal.cc - Issue 11214002: Linux: add an option to use system minizip.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/zip_internal.cc

Issue 11214002: Linux: add an option to use system minizip. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: style nit 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:

Index: chrome/common/zip_internal.cc

diff --git a/chrome/common/zip_internal.cc b/chrome/common/zip_internal.cc

index 54f9055d1fa87c18ac2f1ae54202e66494e270d1..fe84696fd13fc1b2013269a0e8ededf931ee4d9b 100644

--- a/chrome/common/zip_internal.cc

+++ b/chrome/common/zip_internal.cc

@@ -8,13 +8,20 @@

#include "base/logging.h"

#include "base/utf_string_conversions.h"

+#if defined(USE_SYSTEM_MINIZIP)

+#include <minizip/unzip.h>

+#include <minizip/zip.h>

+#include <minizip/ioapi.h>

+#else

#include "third_party/zlib/contrib/minizip/unzip.h"

#include "third_party/zlib/contrib/minizip/zip.h"

#if defined(OS_WIN)

#include "third_party/zlib/contrib/minizip/iowin32.h"

#elif defined(OS_POSIX)

#include "third_party/zlib/contrib/minizip/ioapi.h"

-#endif

+#endif // defined(OS_POSIX)

+#endif // defined(USE_SYSTEM_MINIZIP)

namespace {

« no previous file with comments | « chrome/common/zip_internal.h ('k') | chrome/common/zip_reader.cc » ('j') | no next file with comments »