Bug 752657: switch all uses of sigslot to default to multithreaded (win32 already defaults that way) r=ekr

2024-09-13 09:24:08 -07:00 · 2012-12-11 07:59:57 -05:00 · 2012-12-11 07:59:57 -05:00 · 17c6d540a7
commit 17c6d540a7
parent a73a867478
4 changed files with 4 additions and 3 deletions
--- 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 \
--- a/media/mtransport/sigslot.h
+++ b/media/mtransport/sigslot.h
@ -91,9 +91,6 @@
 #include <set>
 #include <stdlib.h>

-// 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)
--- 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': [
--- 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)