Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1410528 followup - Avoid NSPR dependency on OS X too, to unbreak AWFY. r=jonco on IRC

Browse Source
This commit is contained in:
Jan de Mooij 2017-11-21 11:08:06 +01:00
parent 6732c613c1
commit e1ac6c9b10
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/shell/js.cpp
View File

@ -19,7 +19,7 @@
#include "mozilla/TimeStamp.h"
#include <chrono>
#ifdef __linux__
#if defined(__linux__) || defined(XP_MACOSX)
# include <dlfcn.h>
#endif
#ifdef XP_WIN
@ -65,7 +65,7 @@
# include "jswin.h"
#endif
#include "jswrapper.h"
#ifndef __linux__
#if !defined(__linux__) && !defined(XP_MACOSX)
# include "prerror.h"
# include "prlink.h"
#endif
@ -135,8 +135,8 @@ using mozilla::PodEqual;
using mozilla::TimeDuration;
using mozilla::TimeStamp;
// Avoid an unnecessary NSPR dependency on Linux just for the shell.
#ifdef __linux__
// Avoid an unnecessary NSPR dependency on Linux and OS X just for the shell.
#if defined(__linux__) || defined(XP_MACOSX)
typedef void PRLibrary;
static PRLibrary*
@ -8645,7 +8645,7 @@ class AutoLibraryLoader {
PRLibrary* load(const char* path) {
PRLibrary* dll = PR_LoadLibrary(path);
if (!dll) {
#ifdef __linux__
#if defined(__linux__) || defined(XP_MACOSX)
fprintf(stderr, "LoadLibrary '%s' failed: %s\n", path, dlerror());
#else
fprintf(stderr, "LoadLibrary '%s' failed with code %d\n", path, PR_GetError());