diff options
author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 21:25:20 +0000 |
---|---|---|
committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 21:25:20 +0000 |
commit | 6e80fc3045622a2f6f8cb29e5205fea2fab95b1f (patch) | |
tree | 093517ebd8cc8b25e3104c635f3be82b07bd576f /google/zip_internal.h | |
parent | 6a60aa3a7c5a051d6738209af1ae830112d170d1 (diff) | |
download | zlib-6e80fc3045622a2f6f8cb29e5205fea2fab95b1f.tar.gz |
Revert "Move components/zip to third_party/zip", which broke linux and android tests.
This reverts r197964.
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 2bfe16c46a649b378208484be901769a8e36625e
Diffstat (limited to 'google/zip_internal.h')
-rw-r--r-- | google/zip_internal.h | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/google/zip_internal.h b/google/zip_internal.h deleted file mode 100644 index 57894be..0000000 --- a/google/zip_internal.h +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef THIRD_PARTY_ZLIB_GOOGLE_ZIP_INTERNAL_H_ -#define THIRD_PARTY_ZLIB_GOOGLE_ZIP_INTERNAL_H_ - -#if defined(OS_WIN) -#include <windows.h> -#endif - -#include <string> - -#if defined(USE_SYSTEM_MINIZIP) -#include <minizip/unzip.h> -#include <minizip/zip.h> -#else -#include "third_party/zlib/contrib/minizip/unzip.h" -#include "third_party/zlib/contrib/minizip/zip.h" -#endif - -// Utility functions and constants used internally for the zip file -// library in the directory. Don't use them outside of the library. -namespace zip { -namespace internal { - -// Opens the given file name in UTF-8 for unzipping, with some setup for -// Windows. -unzFile OpenForUnzipping(const std::string& file_name_utf8); - -#if defined(OS_POSIX) -// Opens the file referred to by |zip_fd| for unzipping. -unzFile OpenFdForUnzipping(int zip_fd); -#endif - -#if defined(OS_WIN) -// Opens the file referred to by |zip_handle| for unzipping. -unzFile OpenHandleForUnzipping(HANDLE zip_handle); -#endif - -// Creates a custom unzFile object which reads data from the specified string. -// This custom unzFile object overrides the I/O API functions of zlib so it can -// read data from the specified string. -unzFile PreprareMemoryForUnzipping(const std::string& data); - -// Opens the given file name in UTF-8 for zipping, with some setup for -// Windows. |append_flag| will be passed to zipOpen2(). -zipFile OpenForZipping(const std::string& file_name_utf8, int append_flag); - -#if defined(OS_POSIX) -// Opens the file referred to by |zip_fd| for zipping. |append_flag| will be -// passed to zipOpen2(). -zipFile OpenFdForZipping(int zip_fd, int append_flag); -#endif - -const int kZipMaxPath = 256; -const int kZipBufSize = 8192; - -} // namespace internal -} // namespace zip - -#endif // THIRD_PARTY_ZLIB_GOOGLE_ZIP_INTERNAL_H_ |