From 0e220dbfbcc9fe252e8f1f4890dbfa415aad35db Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Tue, 15 Jun 2004 10:34:08 +1000
Subject:    - djm@cvs.openbsd.org 2004/06/13 15:03:02      [channels.c
 channels.h clientloop.c clientloop.h includes.h readconf.c]      [readconf.h
 scp.1 sftp.1 ssh.1 ssh.c ssh_config.5]      implement session multiplexing in
 the client (the server has supported      this since 2.0); ok markus@

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

(limited to 'defines.h')

diff --git a/defines.h b/defines.h
index 9b72afecb..73a45fe44 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.115 2004/04/14 07:24:30 dtucker Exp $ */
+/* $Id: defines.h,v 1.116 2004/06/15 00:34:08 djm Exp $ */
 
 
 /* Constants */
@@ -462,6 +462,9 @@ struct winsize {
 	 (struct cmsghdr *)NULL)
 #endif /* CMSG_FIRSTHDR */
 
+#ifndef offsetof
+# define offsetof(type, member) ((size_t) &((type *)0)->member)
+#endif
 
 /* Function replacement / compatibility hacks */
 
-- 
cgit v1.2.3


From 59bf4a9bd44ce2c719437c74bd1e8e73b57d3c4a Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 22 Jun 2004 13:27:16 +1000
Subject:  - (dtucker) [defines.h] Define __dead if not already defined.

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

(limited to 'defines.h')

diff --git a/ChangeLog b/ChangeLog
index 226a93cc0..b3d09c70d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,7 @@
      don't show .files by default in ls, add -a option to turn them back on;
      ok markus
  - (dtucker) [monitor.c] Fix Portable-specific -Wshadow warnings on "socket".
+ - (dtucker) [defines.h] Define __dead if not already defined.
 
 20040620
  - (tim) [configure.ac Makefile.in] Only change TEST_SHELL on broken platforms.
@@ -1360,4 +1361,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3428 2004/06/22 03:26:00 dtucker Exp $
+$Id: ChangeLog,v 1.3429 2004/06/22 03:27:16 dtucker Exp $
diff --git a/defines.h b/defines.h
index 73a45fe44..8c1d9c409 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.116 2004/06/15 00:34:08 djm Exp $ */
+/* $Id: defines.h,v 1.117 2004/06/22 03:27:16 dtucker Exp $ */
 
 
 /* Constants */
@@ -424,6 +424,10 @@ struct winsize {
 # define __attribute__(x)
 #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
 
+#ifndef __dead
+# define __dead	__attribute__((noreturn))
+#endif
+
 /* *-*-nto-qnx doesn't define this macro in the system headers */
 #ifdef MISSING_HOWMANY
 # define howmany(x,y)	(((x)+((y)-1))/(y))
-- 
cgit v1.2.3