[SVN-Commit] r920 - in branches/experimental: mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Fri Aug 10 06:44:57 2012
New Revision: 920

Log:
don't add dlfcn.h undconditionally after bug#593911

Modified:
   branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
   branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
   branches/experimental/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp
   branches/experimental/www/firefox-nightly/files/patch-xpcom_base_nsStackWalk.cpp
   branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp
   branches/experimental/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp

Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp	Thu Aug  9 06:51:14 2012	(r919)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp	Fri Aug 10 06:44:57 2012	(r920)
@@ -1,13 +1,5 @@
 --- mozilla/xpcom/base/nsStackWalk.cpp.orig	2010-09-12 19:34:04.012503905 +0300
 +++ mozilla/xpcom/base/nsStackWalk.cpp	2010-09-12 19:34:41.294462134 +0300
-@@ -41,6 +41,7 @@
- /* API for getting a stack trace of the C/C++ stack on the current thread */
- 
- #include "nsStackWalk.h"
-+#include <dlfcn.h>
- 
- #if defined(_WIN32) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64)) && !defined(WINCE) // WIN32 x86 stack walking code
- 
 @@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
  
  #elif defined(HAVE__UNWIND_BACKTRACE)

Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp	Thu Aug  9 06:51:14 2012	(r919)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp	Fri Aug 10 06:44:57 2012	(r920)
@@ -1,13 +1,5 @@
 --- mozilla/xpcom/base/nsStackWalk.cpp.orig	2010-09-12 19:34:04.012503905 +0300
 +++ mozilla/xpcom/base/nsStackWalk.cpp	2010-09-12 19:34:41.294462134 +0300
-@@ -41,6 +41,7 @@
- /* API for getting a stack trace of the C/C++ stack on the current thread */
- 
- #include "nsStackWalk.h"
-+#include <dlfcn.h>
- 
- #if defined(_WIN32) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64)) && !defined(WINCE) // WIN32 x86 stack walking code
- 
 @@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
  
  #elif defined(HAVE__UNWIND_BACKTRACE)

Modified: branches/experimental/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp	Thu Aug  9 06:51:14 2012	(r919)
+++ branches/experimental/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp	Fri Aug 10 06:44:57 2012	(r920)
@@ -1,14 +1,5 @@
 --- xpcom/base/nsStackWalk.cpp.orig	2010-12-15 02:03:41.000000000 +0100
 +++ xpcom/base/nsStackWalk.cpp	2010-12-15 11:28:20.000000000 +0100
-@@ -1137,7 +1137,7 @@
- #define __USE_GNU
- #endif
- 
--#if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
-+#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__FreeBSD__)
- #include <dlfcn.h>
- #endif
- 
 @@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
  
  #elif defined(HAVE__UNWIND_BACKTRACE)

Modified: branches/experimental/www/firefox-nightly/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-xpcom_base_nsStackWalk.cpp	Thu Aug  9 06:51:14 2012	(r919)
+++ branches/experimental/www/firefox-nightly/files/patch-xpcom_base_nsStackWalk.cpp	Fri Aug 10 06:44:57 2012	(r920)
@@ -1,14 +1,5 @@
 --- xpcom/base/nsStackWalk.cpp.orig	2010-12-15 02:03:41.000000000 +0100
 +++ xpcom/base/nsStackWalk.cpp	2010-12-15 11:28:20.000000000 +0100
-@@ -1137,7 +1137,7 @@
- #define __USE_GNU
- #endif
- 
--#if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
-+#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__FreeBSD__)
- #include <dlfcn.h>
- #endif
- 
 @@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
  
  #elif defined(HAVE__UNWIND_BACKTRACE)

Modified: branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp	Thu Aug  9 06:51:14 2012	(r919)
+++ branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp	Fri Aug 10 06:44:57 2012	(r920)
@@ -1,14 +1,5 @@
 --- xpcom/base/nsStackWalk.cpp.orig	2012-05-29 00:57:31.000000000 +0200
 +++ xpcom/base/nsStackWalk.cpp	2012-06-03 12:33:40.000000000 +0200
-@@ -57,7 +57,7 @@
- };
- static CriticalAddress gCriticalAddress;
- 
--#if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
-+#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__FreeBSD__)
- #include <dlfcn.h>
- #endif
- 
 @@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
  
  #elif defined(HAVE__UNWIND_BACKTRACE)

Modified: branches/experimental/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- branches/experimental/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp	Thu Aug  9 06:51:14 2012	(r919)
+++ branches/experimental/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp	Fri Aug 10 06:44:57 2012	(r920)
@@ -1,14 +1,5 @@
 --- xpcom/base/nsStackWalk.cpp.orig	2010-12-15 02:03:41.000000000 +0100
 +++ xpcom/base/nsStackWalk.cpp	2010-12-15 11:28:20.000000000 +0100
-@@ -1137,7 +1137,7 @@
- #define __USE_GNU
- #endif
- 
--#if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
-+#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__FreeBSD__)
- #include <dlfcn.h>
- #endif
- 
 @@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
  
  #elif defined(HAVE__UNWIND_BACKTRACE)