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

Side by Side Diff: mozilla/nsprpub/pr/src/linking/prlink.c

Issue 12089033: Update to NSPR 4.9.5 Beta 2, part 2: actual changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: 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/io/prscanf.c ('k') | mozilla/nsprpub/pr/src/md/prosdep.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 /* This Source Code Form is subject to the terms of the Mozilla Public 2 /* This Source Code Form is subject to the terms of the Mozilla Public
3 * License, v. 2.0. If a copy of the MPL was not distributed with this 3 * License, v. 2.0. If a copy of the MPL was not distributed with this
4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
5 5
6 #include "primpl.h" 6 #include "primpl.h"
7 7
8 #include <string.h> 8 #include <string.h>
9 9
10 #ifdef XP_BEOS 10 #ifdef XP_BEOS
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #elif defined(USE_MACH_DYLD) 47 #elif defined(USE_MACH_DYLD)
48 #include <mach-o/dyld.h> 48 #include <mach-o/dyld.h>
49 #endif 49 #endif
50 #endif /* XP_UNIX */ 50 #endif /* XP_UNIX */
51 51
52 #define _PR_DEFAULT_LD_FLAGS PR_LD_LAZY 52 #define _PR_DEFAULT_LD_FLAGS PR_LD_LAZY
53 53
54 /* 54 /*
55 * On these platforms, symbols have a leading '_'. 55 * On these platforms, symbols have a leading '_'.
56 */ 56 */
57 #if defined(SUNOS4) || (defined(DARWIN) && defined(USE_MACH_DYLD)) \ 57 #if (defined(DARWIN) && defined(USE_MACH_DYLD)) \
58 || defined(NEXTSTEP) || defined(XP_OS2) \ 58 || defined(XP_OS2) \
59 || ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__)) 59 || ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__))
60 #define NEED_LEADING_UNDERSCORE 60 #define NEED_LEADING_UNDERSCORE
61 #endif 61 #endif
62 62
63 #define PR_LD_PATHW 0x8000 /* for PR_LibSpec_PathnameU */ 63 #define PR_LD_PATHW 0x8000 /* for PR_LibSpec_PathnameU */
64 64
65 /************************************************************************/ 65 /************************************************************************/
66 66
67 struct PRLibrary { 67 struct PRLibrary {
68 char* name; /* Our own copy of the name string */ 68 char* name; /* Our own copy of the name string */
(...skipping 1523 matching lines...) Expand 10 before | Expand all | Expand 10 after
1592 result = PR_Malloc(strlen(module_name)+1); 1592 result = PR_Malloc(strlen(module_name)+1);
1593 if (result != NULL) { 1593 if (result != NULL) {
1594 strcpy(result, module_name); 1594 strcpy(result, module_name);
1595 } 1595 }
1596 return result; 1596 return result;
1597 #else 1597 #else
1598 PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); 1598 PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
1599 return NULL; 1599 return NULL;
1600 #endif 1600 #endif
1601 } 1601 }
OLDNEW
« no previous file with comments | « mozilla/nsprpub/pr/src/io/prscanf.c ('k') | mozilla/nsprpub/pr/src/md/prosdep.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698