From 17c6d540a72b6d6b89c9a05281adb90653406a51 Mon Sep 17 00:00:00 2001 From: Randell Jesup Date: Tue, 11 Dec 2012 07:59:57 -0500 Subject: [PATCH] Bug 752657: switch all uses of sigslot to default to multithreaded (win32 already defaults that way) r=ekr --- media/mtransport/build/Makefile.in | 2 ++ media/mtransport/sigslot.h | 3 --- media/webrtc/signaling/signaling.gyp | 1 + netwerk/sctp/datachannel/Makefile.in | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/media/mtransport/build/Makefile.in b/media/mtransport/build/Makefile.in index 7eb850b5894..32eb2377f13 100644 --- a/media/mtransport/build/Makefile.in +++ b/media/mtransport/build/Makefile.in @@ -24,6 +24,8 @@ SRCS_IN_OBJDIR = 1 EXPORTS_NAMESPACES = mtransport +DEFINES += -DSIGSLOT_USE_POSIX_THREADS=1 + EXPORTS_mtransport = \ ../dtlsidentity.h \ ../nricectx.h \ diff --git a/media/mtransport/sigslot.h b/media/mtransport/sigslot.h index 125299e13cd..ccef223c2ba 100644 --- a/media/mtransport/sigslot.h +++ b/media/mtransport/sigslot.h @@ -91,9 +91,6 @@ #include #include -// On our copy of sigslot.h, we set single threading as default. -#define SIGSLOT_DEFAULT_MT_POLICY single_threaded - #if defined(SIGSLOT_PURE_ISO) || (!defined(WIN32) && !defined(__GNUG__) && !defined(SIGSLOT_USE_POSIX_THREADS)) # define _SIGSLOT_SINGLE_THREADED #elif defined(WIN32) diff --git a/media/webrtc/signaling/signaling.gyp b/media/webrtc/signaling/signaling.gyp index 34c335a1bd6..7879d18add8 100644 --- a/media/webrtc/signaling/signaling.gyp +++ b/media/webrtc/signaling/signaling.gyp @@ -162,6 +162,7 @@ 'HAVE_UINT16_T=1', 'HAVE_UINT32_T=1', 'HAVE_UINT64_T=1', + 'SIGSLOT_USE_POSIX_THREADS=1', ], 'cflags_mozilla': [ diff --git a/netwerk/sctp/datachannel/Makefile.in b/netwerk/sctp/datachannel/Makefile.in index c642194386f..f29dbb4df92 100644 --- a/netwerk/sctp/datachannel/Makefile.in +++ b/netwerk/sctp/datachannel/Makefile.in @@ -40,6 +40,7 @@ DEFINES = \ -DINET=1 \ -DINET6=1 \ -DSCTP_DEBUG=1 \ + -DSIGSLOT_USE_POSIX_THREADS=1 \ $(NULL) ifeq ($(OS_TARGET),WINNT)