chrome/common/zip_reader.h - Issue 11194068: Linux: fix build with system zlib.

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_reader.h

Issue 11194068: Linux: fix build with system zlib. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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_reader.h

diff --git a/chrome/common/zip_reader.h b/chrome/common/zip_reader.h

index 72ae225dc44b77bcefabdb30cd250378a51ef2f6..cd3209d091b9b4410977560cbd9d788ba581d4d9 100644

--- a/chrome/common/zip_reader.h

+++ b/chrome/common/zip_reader.h

@@ -12,7 +12,12 @@

#include "base/file_util.h"

#include "base/memory/scoped_ptr.h"

#include "base/time.h"

+#if defined(USE_SYSTEM_MINIZIP)

+#include <minizip/unzip.h>

+#else

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

+#endif

namespace zip {

« no previous file with comments | « chrome/chrome_browser.gypi ('k') | net/http/infinite_cache.cc » ('j') | no next file with comments »