28bb810af5
Merge patches for 1.9.2 mozilla branch from firefox 3.6.x port. While here, build lightning as a subpackage using --enable-calendar. Add @pkgpath/@conflict markers for seamless upgrades.
22 lines
811 B
Plaintext
22 lines
811 B
Plaintext
$OpenBSD: patch-mozilla_xpcom_base_nsStackWalk_cpp,v 1.2 2010/07/27 17:01:16 landry Exp $
|
|
--- mozilla/xpcom/base/nsStackWalk.cpp.orig Wed Jun 23 19:47:14 2010
|
|
+++ mozilla/xpcom/base/nsStackWalk.cpp Wed Jul 7 08:43:19 2010
|
|
@@ -1132,7 +1132,7 @@ NS_FormatCodeAddressDetails(void *aPC, const nsCodeAdd
|
|
#define __USE_GNU
|
|
#endif
|
|
|
|
-#if defined(HAVE_LIBDL) || defined(XP_MACOSX)
|
|
+#if defined(HAVE_LIBDL) || defined(XP_MACOSX) || defined(__OpenBSD__)
|
|
#include <dlfcn.h>
|
|
#endif
|
|
|
|
@@ -1231,7 +1231,7 @@ myinit()
|
|
if (! initialized) {
|
|
#ifndef __GNUC__
|
|
void *handle;
|
|
- const char *libdem = "libdemangle.so.1";
|
|
+ const char *libdem = "libdemangle.so";
|
|
|
|
/* load libdemangle if we can and need to (only try this once) */
|
|
if ((handle = dlopen(libdem, RTLD_LAZY)) != NULL) {
|