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

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

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.cc ('k') | third_party/zlib/google/zip_internal.cc » ('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 #ifndef THIRD_PARTY_ZLIB_GOOGLE_ZIP_INTERNAL_H_ 5 #ifndef THIRD_PARTY_ZLIB_GOOGLE_ZIP_INTERNAL_H_
6 #define THIRD_PARTY_ZLIB_GOOGLE_ZIP_INTERNAL_H_ 6 #define THIRD_PARTY_ZLIB_GOOGLE_ZIP_INTERNAL_H_
7 7
8 #include <string>
9
10 #include "build/build_config.h"
11
8 #if defined(OS_WIN) 12 #if defined(OS_WIN)
9 #include <windows.h> 13 #include <windows.h>
10 #endif 14 #endif
11 15
12 #include <string>
13
14 #if defined(USE_SYSTEM_MINIZIP) 16 #if defined(USE_SYSTEM_MINIZIP)
15 #include <minizip/unzip.h> 17 #include <minizip/unzip.h>
16 #include <minizip/zip.h> 18 #include <minizip/zip.h>
17 #else 19 #else
18 #include "third_party/zlib/contrib/minizip/unzip.h" 20 #include "third_party/zlib/contrib/minizip/unzip.h"
19 #include "third_party/zlib/contrib/minizip/zip.h" 21 #include "third_party/zlib/contrib/minizip/zip.h"
20 #endif 22 #endif
21 23
22 namespace base { 24 namespace base {
23 class FilePath; 25 class FilePath;
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 const std::string& str_path, 67 const std::string& str_path,
66 const zip_fileinfo* file_info); 68 const zip_fileinfo* file_info);
67 69
68 const int kZipMaxPath = 256; 70 const int kZipMaxPath = 256;
69 const int kZipBufSize = 8192; 71 const int kZipBufSize = 8192;
70 72
71 } // namespace internal 73 } // namespace internal
72 } // namespace zip 74 } // namespace zip
73 75
74 #endif // THIRD_PARTY_ZLIB_GOOGLE_ZIP_INTERNAL_H_ 76 #endif // THIRD_PARTY_ZLIB_GOOGLE_ZIP_INTERNAL_H_
OLDNEW
« no previous file with comments | « third_party/zlib/google/zip.cc ('k') | third_party/zlib/google/zip_internal.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698