generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am c2760b19: am 4cf942d3: Merge "sysconf(3) returns long."

Browse Source 
* commit 'c2760b19e7821f241b5d0c31fb975d312600dc58':
  sysconf(3) returns long.
This commit is contained in:
Elliott Hughes
2014-11-14 23:41:35 +00:00
committed by Android Git Automerger
parent 2ee4e1a137 c2760b19e7
commit 134ec0880d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libc/bionic/sysconf.cpp
View File

@@ -149,7 +149,7 @@ static int __sysconf_monotonic_clock() {
return (rc == -1) ? -1 : _POSIX_VERSION; return (rc == -1) ? -1 : _POSIX_VERSION;
} }
int sysconf(int name) { long sysconf(int name) {
switch (name) { switch (name) {
case _SC_ARG_MAX: return _POSIX_ARG_MAX; case _SC_ARG_MAX: return _POSIX_ARG_MAX;
case _SC_CHILD_MAX: return CHILD_MAX; case _SC_CHILD_MAX: return CHILD_MAX;

2
libc/include/sys/sysconf.h
View File

@@ -129,7 +129,7 @@ __BEGIN_DECLS
#define _SC_AVPHYS_PAGES 0x0063 #define _SC_AVPHYS_PAGES 0x0063
#define _SC_MONOTONIC_CLOCK 0x0064 #define _SC_MONOTONIC_CLOCK 0x0064
extern int sysconf(int name); long sysconf(int);
__END_DECLS __END_DECLS

2
libc/include/unistd.h
View File

@@ -202,7 +202,7 @@ extern int acct(const char* filepath);
int getpagesize(void); int getpagesize(void);
extern int sysconf(int name); long sysconf(int);
extern int daemon(int, int); extern int daemon(int, int);