diff options
| author | Paul Eggert | 2015-02-24 16:38:16 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-02-24 16:40:23 -0800 |
| commit | 27bd6dadf4a841c16e7f8fcdbd6068512c02bc3b (patch) | |
| tree | 67a1cae8f1f98c86e24ac80694d12a7c17c6ea7a /lib | |
| parent | b74db6347cf5cac1ebd4c604fd5691c588fd8e32 (diff) | |
| download | emacs-27bd6dadf4a841c16e7f8fcdbd6068512c02bc3b.tar.gz emacs-27bd6dadf4a841c16e7f8fcdbd6068512c02bc3b.zip | |
Merge from gnulib
* lib/getdtablesize.c, m4/dup2.m4, m4/fcntl.m4:
Update from gnulib, incorporating:
2015-02-23 dup2: doc and test for Android bug
2015-02-23 Replace dup2() on Android
2015-02-22 Android doesn't define RLIM_SAVED_*
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/getdtablesize.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c index bad45f7e32f..03eb7ef1bff 100644 --- a/lib/getdtablesize.c +++ b/lib/getdtablesize.c | |||
| @@ -89,6 +89,13 @@ getdtablesize (void) | |||
| 89 | # include <limits.h> | 89 | # include <limits.h> |
| 90 | # include <sys/resource.h> | 90 | # include <sys/resource.h> |
| 91 | 91 | ||
| 92 | # ifndef RLIM_SAVED_CUR | ||
| 93 | # define RLIM_SAVED_CUR RLIM_INFINITY | ||
| 94 | # endif | ||
| 95 | # ifndef RLIM_SAVED_MAX | ||
| 96 | # define RLIM_SAVED_MAX RLIM_INFINITY | ||
| 97 | # endif | ||
| 98 | |||
| 92 | # ifdef __CYGWIN__ | 99 | # ifdef __CYGWIN__ |
| 93 | /* Cygwin 1.7.25 auto-increases the RLIMIT_NOFILE soft limit until it | 100 | /* Cygwin 1.7.25 auto-increases the RLIMIT_NOFILE soft limit until it |
| 94 | hits the compile-time constant hard limit of 3200. We might as | 101 | hits the compile-time constant hard limit of 3200. We might as |