diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
commit | ecebda56da46a03dafff923d91c382f31faa9eec (patch) | |
tree | 449614b6c06a2622c74a609b31fcc46c60037c56 /openbsd-compat/openbsd-compat.h | |
parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) | |
parent | ffc06452028ba78cd693d4ed43df8b60a10d6163 (diff) |
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'openbsd-compat/openbsd-compat.h')
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 807acf626..a8c579f49 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openbsd-compat.h,v 1.52 2011/09/23 01:16:11 djm Exp $ */ | 1 | /* $Id: openbsd-compat.h,v 1.55 2013/02/15 01:20:42 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -149,6 +149,7 @@ int writev(int, struct iovec *, int); | |||
149 | 149 | ||
150 | /* Home grown routines */ | 150 | /* Home grown routines */ |
151 | #include "bsd-misc.h" | 151 | #include "bsd-misc.h" |
152 | #include "bsd-setres_id.h" | ||
152 | #include "bsd-statvfs.h" | 153 | #include "bsd-statvfs.h" |
153 | #include "bsd-waitpid.h" | 154 | #include "bsd-waitpid.h" |
154 | #include "bsd-poll.h" | 155 | #include "bsd-poll.h" |
@@ -189,6 +190,14 @@ int snprintf(char *, size_t, SNPRINTF_CONST char *, ...); | |||
189 | long long strtoll(const char *, char **, int); | 190 | long long strtoll(const char *, char **, int); |
190 | #endif | 191 | #endif |
191 | 192 | ||
193 | #ifndef HAVE_STRTOUL | ||
194 | unsigned long strtoul(const char *, char **, int); | ||
195 | #endif | ||
196 | |||
197 | #ifndef HAVE_STRTOULL | ||
198 | unsigned long long strtoull(const char *, char **, int); | ||
199 | #endif | ||
200 | |||
192 | #ifndef HAVE_STRTONUM | 201 | #ifndef HAVE_STRTONUM |
193 | long long strtonum(const char *, long long, long long, const char **); | 202 | long long strtonum(const char *, long long, long long, const char **); |
194 | #endif | 203 | #endif |