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

Side by Side Diff: mozilla/nsprpub/pr/src/malloc/prmalloc.c

Issue 12084035: Update to NSPR 4.9.5, part 1: MPL 2 upgrade only. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Set License File to mozilla/security/nss/COPYING Created 7 years, 10 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 | « mozilla/nsprpub/pr/src/linking/prlink.c ('k') | mozilla/nsprpub/pr/src/malloc/prmem.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ 1 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
2 /* ***** BEGIN LICENSE BLOCK ***** 2 /* This Source Code Form is subject to the terms of the Mozilla Public
3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 3 * License, v. 2.0. If a copy of the MPL was not distributed with this
4 * 4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
5 * The contents of this file are subject to the Mozilla Public License Version
6 * 1.1 (the "License"); you may not use this file except in compliance with
7 * the License. You may obtain a copy of the License at
8 * http://www.mozilla.org/MPL/
9 *
10 * Software distributed under the License is distributed on an "AS IS" basis,
11 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
12 * for the specific language governing rights and limitations under the
13 * License.
14 *
15 * The Original Code is the Netscape Portable Runtime (NSPR).
16 *
17 * The Initial Developer of the Original Code is
18 * Netscape Communications Corporation.
19 * Portions created by the Initial Developer are Copyright (C) 1998-2000
20 * the Initial Developer. All Rights Reserved.
21 *
22 * Contributor(s):
23 *
24 * Alternatively, the contents of this file may be used under the terms of
25 * either the GNU General Public License Version 2 or later (the "GPL"), or
26 * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
27 * in which case the provisions of the GPL or the LGPL are applicable instead
28 * of those above. If you wish to allow use of your version of this file only
29 * under the terms of either the GPL or the LGPL, and not to allow others to
30 * use your version of this file under the terms of the MPL, indicate your
31 * decision by deleting the provisions above and replace them with the notice
32 * and other provisions required by the GPL or the LGPL. If you do not delete
33 * the provisions above, a recipient may use your version of this file under
34 * the terms of any one of the MPL, the GPL or the LGPL.
35 *
36 * ***** END LICENSE BLOCK ***** */
37 5
38 #include "primpl.h" 6 #include "primpl.h"
39 7
40 /* 8 /*
41 ** We override malloc etc. on any platform which has preemption + 9 ** We override malloc etc. on any platform which has preemption +
42 ** nspr20 user level threads. When we're debugging, we can make our 10 ** nspr20 user level threads. When we're debugging, we can make our
43 ** version of malloc fail occasionally. 11 ** version of malloc fail occasionally.
44 */ 12 */
45 #ifdef _PR_OVERRIDE_MALLOC 13 #ifdef _PR_OVERRIDE_MALLOC
46 14
(...skipping 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after
1165 1133
1166 /* handle as page-allocation or chunk allocation */ 1134 /* handle as page-allocation or chunk allocation */
1167 info = page_dir[index]; 1135 info = page_dir[index];
1168 if (info < MALLOC_MAGIC) 1136 if (info < MALLOC_MAGIC)
1169 free_pages((char*)ptr, page, index, info); 1137 free_pages((char*)ptr, page, index, info);
1170 else 1138 else
1171 free_bytes(ptr,page,index,info); 1139 free_bytes(ptr,page,index,info);
1172 return; 1140 return;
1173 } 1141 }
1174 #endif /* _PR_OVERRIDE_MALLOC */ 1142 #endif /* _PR_OVERRIDE_MALLOC */
OLDNEW
« no previous file with comments | « mozilla/nsprpub/pr/src/linking/prlink.c ('k') | mozilla/nsprpub/pr/src/malloc/prmem.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698