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

Side by Side Diff: nss/mozilla/nsprpub/pr/src/md/windows/w95thred.c

Issue 3135002: Update to NSS 3.12.7 and NSPR 4.8.6.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/
Patch Set: Created 10 years, 4 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
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 /* ***** BEGIN LICENSE BLOCK *****
3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
4 * 4 *
5 * The contents of this file are subject to the Mozilla Public License Version 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 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 7 * the License. You may obtain a copy of the License at
8 * http://www.mozilla.org/MPL/ 8 * http://www.mozilla.org/MPL/
9 * 9 *
10 * Software distributed under the License is distributed on an "AS IS" basis, 10 * Software distributed under the License is distributed on an "AS IS" basis,
(...skipping 20 matching lines...) Expand all
31 * decision by deleting the provisions above and replace them with the notice 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 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 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. 34 * the terms of any one of the MPL, the GPL or the LGPL.
35 * 35 *
36 * ***** END LICENSE BLOCK ***** */ 36 * ***** END LICENSE BLOCK ***** */
37 37
38 #include "primpl.h" 38 #include "primpl.h"
39 #include <process.h> /* for _beginthreadex() */ 39 #include <process.h> /* for _beginthreadex() */
40 40
41 #if _MSC_VER <= 1200 41 #if defined(_MSC_VER) && _MSC_VER <= 1200
42 /* 42 /*
43 * VC++ 6.0 doesn't have DWORD_PTR. 43 * VC++ 6.0 doesn't have DWORD_PTR.
44 */ 44 */
45 45
46 typedef DWORD DWORD_PTR; 46 typedef DWORD DWORD_PTR;
47 #endif /* _MSC_VER <= 1200 */ 47 #endif /* _MSC_VER <= 1200 */
48 48
49 /* --- globals ------------------------------------------------ */ 49 /* --- globals ------------------------------------------------ */
50 #ifdef _PR_USE_STATIC_TLS 50 #ifdef _PR_USE_STATIC_TLS
51 __declspec(thread) struct PRThread *_pr_thread_last_run; 51 __declspec(thread) struct PRThread *_pr_thread_last_run;
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 414
415 #else // _WIN64 415 #else // _WIN64
416 416
417 #pragma data_seg(".CRT$XLB") 417 #pragma data_seg(".CRT$XLB")
418 PIMAGE_TLS_CALLBACK p_thread_callback = PR_OnThreadExit; 418 PIMAGE_TLS_CALLBACK p_thread_callback = PR_OnThreadExit;
419 419
420 // Reset the default section. 420 // Reset the default section.
421 #pragma data_seg() 421 #pragma data_seg()
422 422
423 #endif // _WIN64 423 #endif // _WIN64
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698