summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--openbsd-compat/openbsd-compat.h6
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 063e68973..0dbda414b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120050930
2 - (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype
3 for strtoll. Patch from o.flebbe at science-computing.de.
4
120050929 520050929
2 - (dtucker) [monitor_wrap.c] Remove duplicate definition of loginmsg 6 - (dtucker) [monitor_wrap.c] Remove duplicate definition of loginmsg
3 introduced during sync. 7 introduced during sync.
@@ -3029,4 +3033,4 @@
3029 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3033 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3030 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3034 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3031 3035
3032$Id: ChangeLog,v 1.3899 2005/09/29 12:01:10 dtucker Exp $ 3036$Id: ChangeLog,v 1.3900 2005/09/29 23:55:49 dtucker Exp $
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index ba68bc27e..dda558ffe 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -1,4 +1,4 @@
1/* $Id: openbsd-compat.h,v 1.30 2005/08/26 20:15:20 tim Exp $ */ 1/* $Id: openbsd-compat.h,v 1.31 2005/09/29 23:55:50 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.
@@ -152,6 +152,10 @@ int openpty(int *, int *, char *, struct termios *, struct winsize *);
152int snprintf(char *, size_t, const char *, ...); 152int snprintf(char *, size_t, const char *, ...);
153#endif 153#endif
154 154
155#ifndef HAVE_STRTOLL
156long long strtoll(const char *, char **, int);
157#endif
158
155#ifndef HAVE_STRTONUM 159#ifndef HAVE_STRTONUM
156long long strtonum(const char *, long long, long long, const char **); 160long long strtonum(const char *, long long, long long, const char **);
157#endif 161#endif