Merge from OPENSSH_3_8_1P1_GSSAPI_20040713 to OPENSSH_3_9P1_GSSAPI_20040818.

[gssapi-openssh.git] / openssh / defines.h

diff --git a/openssh/defines.h b/openssh/defines.h
index 889b918867b8907a7c3e64c1e2cd924a5a15b4d6..b21235fddc5e9d53a2d434ab2f64c6d58e228313 100644 (file)
--- a/openssh/defines.h
+++ b/openssh/defines.h
@@ -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))
@@ -462,6 +466,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 */