third_party/zlib/contrib/minizip/mztools.h - Issue 11632002: Use generated shim headers for 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: third_party/zlib/contrib/minizip/mztools.h

Issue 11632002: Use generated shim headers for zlib. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: re-upload Created 8 years 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: third_party/zlib/contrib/minizip/mztools.h

diff --git a/third_party/zlib/contrib/minizip/mztools.h b/third_party/zlib/contrib/minizip/mztools.h

index 9731f19039645c00310e1328f66ccae79a22c8b7..90c834d3ab5e9a8acf89a93b93edf3fcbeeac5c7 100644

--- a/third_party/zlib/contrib/minizip/mztools.h

+++ b/third_party/zlib/contrib/minizip/mztools.h

@@ -12,12 +12,8 @@ extern "C" {

#endif

#ifndef _ZLIB_H

Mark Mentovai 2012/12/18 19:48:17 Is this (and the __cplusplus) in the upstream file

Paweł Hajdan Jr. 2012/12/18 20:57:41 Yes to both.

-#if defined(USE_SYSTEM_ZLIB)

-#include <zlib.h>

-#else

#include "third_party/zlib/zlib.h"

#endif

-#endif

#include "unzip.h"