summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--openbsd-compat/openbsd-compat.h14
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 8edb2d888..88e4fe267 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
6 - (dtucker) [configure.ac openbsd-compat/Makefile.in openbsd-compat/strtoull.c 6 - (dtucker) [configure.ac openbsd-compat/Makefile.in openbsd-compat/strtoull.c
7 openbsd-compat/openbsd-compat.h] Add strtoull to compat library for 7 openbsd-compat/openbsd-compat.h] Add strtoull to compat library for
8 platforms that don't have it. 8 platforms that don't have it.
9 - (dtucker) [openbsd-compat/openbsd-compat.h] Add prototype for strtoul,
10 group strto* function prototypes together.
9 - (djm) OpenBSD CVS Sync 11 - (djm) OpenBSD CVS Sync
10 - djm@cvs.openbsd.org 2013/02/14 21:35:59 12 - djm@cvs.openbsd.org 2013/02/14 21:35:59
11 [auth2-pubkey.c] 13 [auth2-pubkey.c]
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 99cebef71..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.54 2013/02/15 01:13:02 dtucker 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.
@@ -190,6 +190,14 @@ int snprintf(char *, size_t, SNPRINTF_CONST char *, ...);
190long long strtoll(const char *, char **, int); 190long long strtoll(const char *, char **, int);
191#endif 191#endif
192 192
193#ifndef HAVE_STRTOUL
194unsigned long strtoul(const char *, char **, int);
195#endif
196
197#ifndef HAVE_STRTOULL
198unsigned long long strtoull(const char *, char **, int);
199#endif
200
193#ifndef HAVE_STRTONUM 201#ifndef HAVE_STRTONUM
194long long strtonum(const char *, long long, long long, const char **); 202long long strtonum(const char *, long long, long long, const char **);
195#endif 203#endif
@@ -218,10 +226,6 @@ char *group_from_gid(gid_t, int);
218int timingsafe_bcmp(const void *, const void *, size_t); 226int timingsafe_bcmp(const void *, const void *, size_t);
219#endif 227#endif
220 228
221#ifndef HAVE_STRTOULL
222unsigned long long strtoull(const char *, char **, int);
223#endif
224
225void *xmmap(size_t size); 229void *xmmap(size_t size);
226char *xcrypt(const char *password, const char *salt); 230char *xcrypt(const char *password, const char *salt);
227char *shadow_pw(struct passwd *pw); 231char *shadow_pw(struct passwd *pw);