summaryrefslogtreecommitdiff
path: root/include/stdlib.h
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2009-01-11 02:57:17 +0000
committerchristos <christos@NetBSD.org>2009-01-11 02:57:17 +0000
commit50728e7823a76d5bd1a7bfa3a4eac400269b1339 (patch)
tree5b1b601fa26666805e692b32905eaacd0f55d8d5 /include/stdlib.h
parent461a86f9bdbf4658bc4b37796e978427095f94a7 (diff)
merge christos-time_t
Diffstat (limited to 'include/stdlib.h')
-rw-r--r--include/stdlib.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/include/stdlib.h b/include/stdlib.h
index 2adc31a8414..65f92d82b30 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -1,4 +1,4 @@
-/* $NetBSD: stdlib.h,v 1.85 2008/06/21 00:58:00 gmcgarry Exp $ */
+/* $NetBSD: stdlib.h,v 1.86 2009/01/11 03:04:12 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -265,7 +265,9 @@ int cgetustr(char *, const char *, char **);
void csetexpandtc(int);
int daemon(int, int);
-__aconst char *devname(dev_t, mode_t);
+#ifndef __LIBC12_SOURCE__
+__aconst char *devname(dev_t, mode_t) __RENAME(__devname50);
+#endif
#define HN_DECIMAL 0x01
#define HN_NOSPACE 0x02
@@ -278,7 +280,9 @@ __aconst char *devname(dev_t, mode_t);
int humanize_number(char *, size_t, int64_t, const char *, int, int);
int dehumanize_number(const char *, int64_t *);
-dev_t getdevmajor(const char *, mode_t);
+#ifndef __LIBC12_SOURCE__
+dev_t getdevmajor(const char *, mode_t) __RENAME(__getdevmajor50);
+#endif
int getloadavg(double [], int);
int getenv_r(const char *, char *, size_t);