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

Side by Side Diff: third_party/zlib/zutil.c

Issue 17358: Apply Gears modifications to zlib to our copy, so we're both using the same... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | Annotate | Revision Log
« no previous file with comments | « third_party/zlib/gzio.c ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* zutil.c -- target dependent utility functions for the compression library 1 /* zutil.c -- target dependent utility functions for the compression library
2 * Copyright (C) 1995-2005 Jean-loup Gailly. 2 * Copyright (C) 1995-2005 Jean-loup Gailly.
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
6 /* @(#) $Id: zutil.c,v 3.11 2005/08/04 19:14:14 tor%cs.brown.edu Exp $ */ 6 /* @(#) $Id: zutil.c,v 3.11 2005/08/04 19:14:14 tor%cs.brown.edu Exp $ */
7 7
8 #include "zutil.h" 8 #include "zutil.h"
9 9
10 #ifndef NO_DUMMY_DECL 10 #ifndef NO_DUMMY_DECL
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 int err; 134 int err;
135 { 135 {
136 return ERR_MSG(err); 136 return ERR_MSG(err);
137 } 137 }
138 138
139 #if defined(_WIN32_WCE) 139 #if defined(_WIN32_WCE)
140 /* The Microsoft C Run-Time Library for Windows CE doesn't have 140 /* The Microsoft C Run-Time Library for Windows CE doesn't have
141 * errno. We define it as a global variable to simplify porting. 141 * errno. We define it as a global variable to simplify porting.
142 * Its value is always 0 and should not be used. 142 * Its value is always 0 and should not be used.
143 */ 143 */
144 int errno = 0; 144 // Google Gears modification: zutil.h defines errno as z_errno for WinCE.
145 //int errno = 0;
146 int z_errno = 0;
145 #endif 147 #endif
146 148
147 #ifndef HAVE_MEMCPY 149 #ifndef HAVE_MEMCPY
148 150
149 void zmemcpy(dest, source, len) 151 void zmemcpy(dest, source, len)
150 Bytef* dest; 152 Bytef* dest;
151 const Bytef* source; 153 const Bytef* source;
152 uInt len; 154 uInt len;
153 { 155 {
154 if (len == 0) return; 156 if (len == 0) return;
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 311
310 void zcfree (opaque, ptr) 312 void zcfree (opaque, ptr)
311 voidpf opaque; 313 voidpf opaque;
312 voidpf ptr; 314 voidpf ptr;
313 { 315 {
314 free(ptr); 316 free(ptr);
315 if (opaque) return; /* make compiler happy */ 317 if (opaque) return; /* make compiler happy */
316 } 318 }
317 319
318 #endif /* MY_ZCALLOC */ 320 #endif /* MY_ZCALLOC */
OLDNEW
« no previous file with comments | « third_party/zlib/gzio.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698