summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-11-14 15:14:44 -0800
committerElliott Hughes <enh@google.com>2014-11-14 15:14:44 -0800
commit60d84af1726225320b26683b726e5e735d9d76e8 (patch)
treee8eec3ae90eecfffa1ce0ada103512b9819f3ef1
parentcdcef73a23833ebd50bb5b654eb278b164e286ad (diff)
downloadbionic-60d84af1726225320b26683b726e5e735d9d76e8.zip
bionic-60d84af1726225320b26683b726e5e735d9d76e8.tar.gz
bionic-60d84af1726225320b26683b726e5e735d9d76e8.tar.bz2
sysconf(3) returns long.
On LP32, this makes no difference. Not an ABI change. On LP64, results are going to be in %rax or x0 whether they're 32- or 64-bit, and the only difference is going to be whether the top bits are clobbered. Bug: 18390956 Change-Id: I0bd4496231bdded34c1fa03e895021ac0df7f8e1
-rw-r--r--libc/bionic/sysconf.cpp2
-rw-r--r--libc/include/sys/sysconf.h2
-rw-r--r--libc/include/unistd.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/libc/bionic/sysconf.cpp b/libc/bionic/sysconf.cpp
index 951860d..fb704ad 100644
--- a/libc/bionic/sysconf.cpp
+++ b/libc/bionic/sysconf.cpp
@@ -149,7 +149,7 @@ static int __sysconf_monotonic_clock() {
return (rc == -1) ? -1 : _POSIX_VERSION;
}
-int sysconf(int name) {
+long sysconf(int name) {
switch (name) {
case _SC_ARG_MAX: return _POSIX_ARG_MAX;
case _SC_CHILD_MAX: return CHILD_MAX;
diff --git a/libc/include/sys/sysconf.h b/libc/include/sys/sysconf.h
index 0a46e7a..3d058d7 100644
--- a/libc/include/sys/sysconf.h
+++ b/libc/include/sys/sysconf.h
@@ -129,7 +129,7 @@ __BEGIN_DECLS
#define _SC_AVPHYS_PAGES 0x0063
#define _SC_MONOTONIC_CLOCK 0x0064
-extern int sysconf(int name);
+long sysconf(int);
__END_DECLS
diff --git a/libc/include/unistd.h b/libc/include/unistd.h
index dca9b3d..e94ee66 100644
--- a/libc/include/unistd.h
+++ b/libc/include/unistd.h
@@ -202,7 +202,7 @@ extern int acct(const char* filepath);
int getpagesize(void);
-extern int sysconf(int name);
+long sysconf(int);
extern int daemon(int, int);