blob: 75f5dad866ee4fbe7a2a354d19940f982f5e419f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
$NetBSD: patch-browser_app_nsBrowserApp.cpp,v 1.1 2015/07/09 14:13:52 ryoon Exp $
* Replace XP_MACOSX with XP_DARWIN as the former is not defined when
the toolkit is not cocoa.
--- browser/app/nsBrowserApp.cpp.orig 2015-05-04 00:43:18.000000000 +0000
+++ browser/app/nsBrowserApp.cpp
@@ -18,8 +18,10 @@
#include <unistd.h>
#endif
-#ifdef XP_MACOSX
+#ifdef XP_DARWIN
#include <mach/mach_time.h>
+#endif
+#ifdef MOZ_WIDGET_COCOA
#include "MacQuirks.h"
#endif
@@ -459,7 +461,7 @@ TimeStamp_Now()
}
return sGetTickCount64() * freq.QuadPart;
-#elif defined(XP_MACOSX)
+#elif defined(XP_DARWIN)
return mach_absolute_time();
#elif defined(HAVE_CLOCK_MONOTONIC)
struct timespec ts;
@@ -606,6 +608,7 @@ int main(int argc, char* argv[])
TriggerQuirks();
#endif
+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
int gotCounters;
#if defined(XP_UNIX)
struct rusage initialRUsage;
|
