diff --git a/libc/Android.mk b/libc/Android.mk index 5e86dac29..4866f68b0 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -45,7 +45,6 @@ libc_common_src_files := \ bionic/ether_ntoa.c \ bionic/ftime.c \ bionic/fts.c \ - bionic/getdtablesize.c \ bionic/gethostname.c \ bionic/getpriority.c \ bionic/getpt.c \ diff --git a/libc/bionic/getdtablesize.c b/libc/bionic/getdtablesize.c deleted file mode 100644 index 91315a5a1..000000000 --- a/libc/bionic/getdtablesize.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include - -int getdtablesize() -{ - struct rlimit r; - - if (getrlimit(RLIMIT_NOFILE, &r) < 0) { - return sysconf(_SC_OPEN_MAX); - } - return r.rlim_cur; -} diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp index 4834d6e82..43078fdcc 100644 --- a/libc/bionic/ndk_cruft.cpp +++ b/libc/bionic/ndk_cruft.cpp @@ -255,4 +255,15 @@ extern "C" pid_t wait3(int* status, int options, struct rusage* rusage) { return wait4(-1, status, options, rusage); } +// This was removed from POSIX 2004. +extern "C" int getdtablesize() { + struct rlimit r; + + if (getrlimit(RLIMIT_NOFILE, &r) < 0) { + return sysconf(_SC_OPEN_MAX); + } + + return r.rlim_cur; +} + #endif diff --git a/libc/include/unistd.h b/libc/include/unistd.h index ee6d7b12e..afe5f1a3f 100644 --- a/libc/include/unistd.h +++ b/libc/include/unistd.h @@ -164,8 +164,6 @@ extern int usleep(useconds_t); extern int gethostname(char *, size_t); -extern int getdtablesize(void); - extern void *__brk(void *); extern int brk(void *); extern void *sbrk(ptrdiff_t);