зеркало из https://github.com/mozilla/pjs.git
Removed -D_PR_NEED_FAKE_POLL from FreeBSD.mk and NEXTSTEP.mk. This
macro is defined internally. In _freebsd.h, include poll.h if poll is available. Thanks to Jeremy Lea <reg@shale.csir.co.za> for suggesting the patches.
This commit is contained in:
Родитель
6f1bb88c36
Коммит
e494dcd8c5
|
@ -33,7 +33,7 @@ OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DFREEBSD -DHAVE_S
|
||||||
ifeq ($(USE_PTHREADS),1)
|
ifeq ($(USE_PTHREADS),1)
|
||||||
IMPL_STRATEGY = _PTH
|
IMPL_STRATEGY = _PTH
|
||||||
OS_LIBS = -lc_r
|
OS_LIBS = -lc_r
|
||||||
DEFINES += -D_THREAD_SAFE -D_PR_NEED_FAKE_POLL
|
DEFINES += -D_THREAD_SAFE
|
||||||
else
|
else
|
||||||
IMPL_STRATEGY = _EMU
|
IMPL_STRATEGY = _EMU
|
||||||
OS_LIBS = -lc
|
OS_LIBS = -lc
|
||||||
|
|
|
@ -41,7 +41,7 @@ CPU_ARCH := $(shell uname -p)
|
||||||
|
|
||||||
OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -fno-common -pipe -DNEXTSTEP -DHAVE_STRERROR -DHAVE_BSD_FLOCK -D_POSIX_SOURCE -traditional-cpp -posix
|
OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -fno-common -pipe -DNEXTSTEP -DHAVE_STRERROR -DHAVE_BSD_FLOCK -D_POSIX_SOURCE -traditional-cpp -posix
|
||||||
|
|
||||||
DEFINES += -D_PR_LOCAL_THREADS_ONLY -D_PR_NEED_FAKE_POLL
|
DEFINES += -D_PR_LOCAL_THREADS_ONLY
|
||||||
|
|
||||||
ARCH = $(CPU_ARCH)
|
ARCH = $(CPU_ARCH)
|
||||||
|
|
||||||
|
|
|
@ -204,6 +204,7 @@ extern PRIntervalTime _PR_UNIX_TicksPerSecond(void);
|
||||||
#define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv)
|
#define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv)
|
||||||
|
|
||||||
#if defined(_PR_POLL_AVAILABLE)
|
#if defined(_PR_POLL_AVAILABLE)
|
||||||
|
#include <poll.h>
|
||||||
#define _MD_POLL(fds,nfds,timeout) syscall(SYS_poll,fds,nfds,timeout)
|
#define _MD_POLL(fds,nfds,timeout) syscall(SYS_poll,fds,nfds,timeout)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче