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

Side by Side Diff: third_party/zlib/google/zip_internal.cc

Issue 1552513002: Switch to standard integer types in third_party/zlib/google/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 unified diff | Download patch
« no previous file with comments | « third_party/zlib/google/zip_internal.h ('k') | third_party/zlib/google/zip_reader.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "third_party/zlib/google/zip_internal.h" 5 #include "third_party/zlib/google/zip_internal.h"
6 6
7 #include <stddef.h>
8
7 #include <algorithm> 9 #include <algorithm>
8 10
9 #include "base/files/file_util.h" 11 #include "base/files/file_util.h"
10 #include "base/logging.h" 12 #include "base/logging.h"
11 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
12 #include "base/time/time.h" 14 #include "base/time/time.h"
15 #include "build/build_config.h"
13 16
14 #if defined(USE_SYSTEM_MINIZIP) 17 #if defined(USE_SYSTEM_MINIZIP)
15 #include <minizip/ioapi.h> 18 #include <minizip/ioapi.h>
16 #include <minizip/unzip.h> 19 #include <minizip/unzip.h>
17 #include <minizip/zip.h> 20 #include <minizip/zip.h>
18 #else 21 #else
19 #include "third_party/zlib/contrib/minizip/unzip.h" 22 #include "third_party/zlib/contrib/minizip/unzip.h"
20 #include "third_party/zlib/contrib/minizip/zip.h" 23 #include "third_party/zlib/contrib/minizip/zip.h"
21 #if defined(OS_WIN) 24 #if defined(OS_WIN)
22 #include "third_party/zlib/contrib/minizip/iowin32.h" 25 #include "third_party/zlib/contrib/minizip/iowin32.h"
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 0, // versionMadeBy 381 0, // versionMadeBy
379 LANGUAGE_ENCODING_FLAG)) { // flagBase 382 LANGUAGE_ENCODING_FLAG)) { // flagBase
380 DLOG(ERROR) << "Could not open zip file entry " << str_path; 383 DLOG(ERROR) << "Could not open zip file entry " << str_path;
381 return false; 384 return false;
382 } 385 }
383 return true; 386 return true;
384 } 387 }
385 388
386 } // namespace internal 389 } // namespace internal
387 } // namespace zip 390 } // namespace zip
OLDNEW
« no previous file with comments | « third_party/zlib/google/zip_internal.h ('k') | third_party/zlib/google/zip_reader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698