diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-08 07:48:28 +0000 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-08 07:48:28 +0000 |
| commit | ba9e648ce2705ad1c4679325a9326c47263e2a3e (patch) | |
| tree | 724cf5101a1b5923c235dc767b355a7b0e906eb7 /config | |
| parent | c8300fbd6ae08925736c32f8b02c980ce1531f3f (diff) | |
| parent | 19c0f5e9ff625c6a67e5e0a08f0a800782168492 (diff) | |
| download | UXP-ba9e648ce2705ad1c4679325a9326c47263e2a3e.tar UXP-ba9e648ce2705ad1c4679325a9326c47263e2a3e.tar.gz UXP-ba9e648ce2705ad1c4679325a9326c47263e2a3e.tar.lz UXP-ba9e648ce2705ad1c4679325a9326c47263e2a3e.tar.xz UXP-ba9e648ce2705ad1c4679325a9326c47263e2a3e.zip | |
Merge branch 'master' into remove-unboxed
Diffstat (limited to 'config')
| -rw-r--r-- | config/external/nspr/pr/moz.build | 2 | ||||
| -rw-r--r-- | config/milestone.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/external/nspr/pr/moz.build b/config/external/nspr/pr/moz.build index cda249b8a..af710f850 100644 --- a/config/external/nspr/pr/moz.build +++ b/config/external/nspr/pr/moz.build @@ -38,6 +38,8 @@ elif CONFIG['OS_TARGET'] in ('FreeBSD', 'OpenBSD', 'NetBSD'): SOURCES += ['/nsprpub/pr/src/md/unix/%s.c' % CONFIG['OS_TARGET'].lower()] elif CONFIG['OS_TARGET'] == 'Darwin': OS_LIBS += ['-framework CoreServices'] + DEFINES['FD_SETSIZE'] = 10240 + DEFINES['_DARWIN_UNLIMITED_SELECT'] = True DEFINES.update( DARWIN=True, HAVE_BSD_FLOCK=True, diff --git a/config/milestone.txt b/config/milestone.txt index 7aab8cfcb..cf45e1d05 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -4.2.0 +4.2.1 |