From d0aa46158796196b79125573703024ae48c6c0dd Mon Sep 17 00:00:00 2001 From: David Adam Date: Sun, 15 May 2016 21:44:11 +0000 Subject: fallback: remove sysconf fallback sysconf was introduced in IEEE Std 1003.1-1988 (POSIX.1) and exists on every system I can find. Work on #2999. --- configure.ac | 2 +- src/fallback.cpp | 13 ------------- src/fallback.h | 5 ----- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index e50258b0..48fdaf35 100644 --- a/configure.ac +++ b/configure.ac @@ -313,7 +313,7 @@ AC_STRUCT_DIRENT_D_TYPE AC_CHECK_FUNCS( wcsdup wcsndup wcslen wcscasecmp wcsncasecmp fwprintf ) AC_CHECK_FUNCS( futimes wcwidth wcswidth wcstok fputwc fgetwc ) AC_CHECK_FUNCS( wcstol wcslcat wcslcpy lrand48_r killpg ) -AC_CHECK_FUNCS( backtrace backtrace_symbols_fd sysconf getifaddrs ) +AC_CHECK_FUNCS( backtrace backtrace_symbols_fd getifaddrs ) AC_CHECK_FUNCS( futimens clock_gettime ) AC_CHECK_DECL( [mkostemp], [ AC_CHECK_FUNCS([mkostemp]) ] ) diff --git a/src/fallback.cpp b/src/fallback.cpp index 92c3e1fc..15c5614f 100644 --- a/src/fallback.cpp +++ b/src/fallback.cpp @@ -955,19 +955,6 @@ int backtrace(void **buffer, int size) { return 0; } char **backtrace_symbols_fd(void *const *buffer, int size, int fd) { return 0; } #endif -#ifndef HAVE_SYSCONF - -long sysconf(int name) { - if (name == _SC_ARG_MAX) { -#ifdef ARG_MAX - return ARG_MAX; -#endif - } - - return -1; -} -#endif - #ifndef HAVE_NAN double nan(char *tagp) { return 0.0 / 0.0; } #endif diff --git a/src/fallback.h b/src/fallback.h index 97c72b77..241edb5a 100644 --- a/src/fallback.h +++ b/src/fallback.h @@ -253,11 +253,6 @@ extern int _nl_msg_cat_cntr; int killpg(int pgr, int sig); #endif -#ifndef HAVE_SYSCONF -#define _SC_ARG_MAX 1 -long sysconf(int name); -#endif - #ifndef HAVE_NAN double nan(char *tagp); #endif -- cgit v1.2.3