From 709d0ce67201e980258c84928fda46edd1c8d38f Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 9 Jan 2010 09:25:54 +1100
Subject:  - (dtucker) [defines.h] define PRIu64 for platforms that don't have
 it.

---
 defines.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'defines.h')

diff --git a/defines.h b/defines.h
index 2ddfd96d0..053893ee4 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.156 2009/08/28 01:21:07 dtucker Exp $ */
+/* $Id: defines.h,v 1.157 2010/01/08 22:25:54 dtucker Exp $ */
 
 
 /* Constants */
@@ -753,4 +753,8 @@ struct winsize {
 # define SSH_IOBUFSZ 8192
 #endif
 
+#ifndef PRIu64
+# define PRIu64 "llu"
+#endif
+
 #endif /* _DEFINES_H */
-- 
cgit v1.2.3


From 269275c90cd2ffda85f32114bfaeff978298e346 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 9 Jan 2010 22:33:37 +1100
Subject:  - (dtucker) [defines.h] Remove now-undeeded PRIu64 define.

---
 ChangeLog | 1 +
 defines.h | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'defines.h')

diff --git a/ChangeLog b/ChangeLog
index 47cb97afe..6700f308e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@
      Afer sshd receives a SIGHUP, ignore subsequent HUPs while sshd re-execs
      itself.  Prevents two HUPs in quick succession from resulting in sshd
      dying.  bz#1692, patch from Colin Watson via Ubuntu.
+ - (dtucker) [defines.h] Remove now-undeeded PRIu64 define.
 
 20091208
  - (dtucker) OpenBSD CVS Sync
diff --git a/defines.h b/defines.h
index 053893ee4..3211cc916 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.157 2010/01/08 22:25:54 dtucker Exp $ */
+/* $Id: defines.h,v 1.158 2010/01/09 11:33:37 dtucker Exp $ */
 
 
 /* Constants */
@@ -753,8 +753,4 @@ struct winsize {
 # define SSH_IOBUFSZ 8192
 #endif
 
-#ifndef PRIu64
-# define PRIu64 "llu"
-#endif
-
 #endif /* _DEFINES_H */
-- 
cgit v1.2.3


From d4a7fcbc462b2af134f6e59a6068fbe5b35fba80 Mon Sep 17 00:00:00 2001
From: Tim Rice <tim@multitalents.net>
Date: Wed, 13 Jan 2010 15:44:34 -0800
Subject:  - (tim) [defines.h] openbsd-compat/readpassphrase.c now needs _NSIG.
    feedback and ok dtucker@

---
 ChangeLog |  2 ++
 defines.h | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'defines.h')

diff --git a/ChangeLog b/ChangeLog
index 18ce0aa38..1efed808c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,8 @@
      don't append a space after inserting a completion of a directory (i.e.
      a path ending in '/') for a slightly better user experience; ok dtucker@
  - (dtucker) [sftp-common.c] Wrap include of util.h in an ifdef.
+ - (tim) [defines.h] openbsd-compat/readpassphrase.c now needs _NSIG. 
+   feedback and ok dtucker@
 
 20100112
  - (dtucker) OpenBSD CVS Sync
diff --git a/defines.h b/defines.h
index 3211cc916..c9b93bf71 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.158 2010/01/09 11:33:37 dtucker Exp $ */
+/* $Id: defines.h,v 1.159 2010/01/13 23:44:34 tim Exp $ */
 
 
 /* Constants */
@@ -753,4 +753,12 @@ struct winsize {
 # define SSH_IOBUFSZ 8192
 #endif
 
+#ifndef _NSIG
+# ifdef NSIG
+#  define _NSIG NSIG
+# else
+#  define _NSIG 128
+# endif
+#endif
+
 #endif /* _DEFINES_H */
-- 
cgit v1.2.3