From f32db83f41cc0c1355ae28fd9df464ea56562d2d Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 15 Feb 2013 12:20:41 +1100 Subject: - (dtucker) [openbsd-compat/openbsd-compat.h] Add prototype for strtoul, group strto* function prototypes together. --- ChangeLog | 2 ++ openbsd-compat/openbsd-compat.h | 14 +++++++++----- 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 @@ - (dtucker) [configure.ac openbsd-compat/Makefile.in openbsd-compat/strtoull.c openbsd-compat/openbsd-compat.h] Add strtoull to compat library for platforms that don't have it. + - (dtucker) [openbsd-compat/openbsd-compat.h] Add prototype for strtoul, + group strto* function prototypes together. - (djm) OpenBSD CVS Sync - djm@cvs.openbsd.org 2013/02/14 21:35:59 [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 @@ -/* $Id: openbsd-compat.h,v 1.54 2013/02/15 01:13:02 dtucker Exp $ */ +/* $Id: openbsd-compat.h,v 1.55 2013/02/15 01:20:42 dtucker Exp $ */ /* * Copyright (c) 1999-2003 Damien Miller. All rights reserved. @@ -190,6 +190,14 @@ int snprintf(char *, size_t, SNPRINTF_CONST char *, ...); long long strtoll(const char *, char **, int); #endif +#ifndef HAVE_STRTOUL +unsigned long strtoul(const char *, char **, int); +#endif + +#ifndef HAVE_STRTOULL +unsigned long long strtoull(const char *, char **, int); +#endif + #ifndef HAVE_STRTONUM long long strtonum(const char *, long long, long long, const char **); #endif @@ -218,10 +226,6 @@ char *group_from_gid(gid_t, int); int timingsafe_bcmp(const void *, const void *, size_t); #endif -#ifndef HAVE_STRTOULL -unsigned long long strtoull(const char *, char **, int); -#endif - void *xmmap(size_t size); char *xcrypt(const char *password, const char *salt); char *shadow_pw(struct passwd *pw); -- cgit v1.2.3