wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 807492 Part 2 - Allow to build media/webrtc/signaling on BSD r=ehugg

Browse Source
This commit is contained in:
Landry Breuil 2013-08-14 00:00:03 +02:00
parent 75090b27c8
commit 163af7e24e
3 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
media/webrtc/signaling/signaling.gyp
View File

@ -228,6 +228,19 @@
'cflags_mozilla': [
],
}],
['os_bsd==1', {
'include_dirs': [
],
'defines': [
# avoiding pointless ifdef churn
'SIP_OS_OSX',
'OSX',
'SECLIB_OPENSSL',
],
'cflags_mozilla': [
],
}],
['OS=="mac"', {
'include_dirs': [
],
@ -760,7 +773,7 @@
],
}],
['OS=="mac"', {
['OS=="mac" or os_bsd==1', {
'include_dirs': [
],
@ -801,19 +814,34 @@
],
'defines' : [
'SIP_OS_OSX',
'_POSIX_SOURCE',
'CPR_MEMORY_LITTLE_ENDIAN',
'NO_SOCKET_POLLING',
'USE_TIMER_SELECT_BASED',
'FULL_BUILD',
'STUBBED_OUT',
'USE_PRINTF',
'_DARWIN_C_SOURCE',
'NO_NSPR_10_SUPPORT',
'conditions': [
['OS=="mac"', {
'defines' : [
'SIP_OS_OSX',
'_POSIX_SOURCE',
'CPR_MEMORY_LITTLE_ENDIAN',
'NO_SOCKET_POLLING',
'USE_TIMER_SELECT_BASED',
'FULL_BUILD',
'STUBBED_OUT',
'USE_PRINTF',
'_DARWIN_C_SOURCE',
'NO_NSPR_10_SUPPORT',
],
}],
['os_bsd==1', {
'defines' : [
'SIP_OS_OSX',
'CPR_MEMORY_LITTLE_ENDIAN',
'NO_SOCKET_POLLING',
'USE_TIMER_SELECT_BASED',
'FULL_BUILD',
'STUBBED_OUT',
'USE_PRINTF',
'NO_NSPR_10_SUPPORT',
],
}],
],
'cflags_mozilla': [
],
}],

4
media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
View File

@ -321,11 +321,15 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData)
cpr_msgq_node_t *node;
struct timespec timeout;
struct timeval tv;
#ifndef __APPLE__
struct timezone tz;
#else
// On the iPhone, there is a DarwinAlias problem with "timezone"
struct _timezone {
int tz_minuteswest; /* of Greenwich */
int tz_dsttime; /* type of dst correction to apply */
} tz;
#endif
/* Initialize ppUserData */
if (ppUserData) {

2
media/webrtc/signaling/test/Makefile.in
View File

@ -83,7 +83,7 @@ LIBS += \
$(NULL)
endif
ifeq ($(OS_TARGET),Linux)
ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
LIBS += \
$(MOZ_CAIRO_OSLIBS) \
$(NULL)