summaryrefslogtreecommitdiffstats
path: root/defines.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-04-29 07:06:44 +0200
committerDarren Tucker <dtucker@zip.com.au>2007-04-29 07:06:44 +0200
commitdca0edff2fb312e05fd7f2d560fb80bc97a38350 (patch)
tree09e924dd1b7d19266473ecd2a188aee29e3e8a75 /defines.h
parent - (dtucker) [configure.ac defines.h] Prevent warnings about __attribute__ (diff)
downloadopenssh-dca0edff2fb312e05fd7f2d560fb80bc97a38350.tar.xz
openssh-dca0edff2fb312e05fd7f2d560fb80bc97a38350.zip
- (dtucker) [configure.ac defines.h] Have configure check for offsetof
to prevent redefinition warnings.
Diffstat (limited to 'defines.h')
-rw-r--r--defines.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/defines.h b/defines.h
index 5e75bc624..336880c96 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
#ifndef _DEFINES_H
#define _DEFINES_H
-/* $Id: defines.h,v 1.141 2007/04/29 04:49:21 dtucker Exp $ */
+/* $Id: defines.h,v 1.142 2007/04/29 05:06:45 dtucker Exp $ */
/* Constants */
@@ -491,7 +491,7 @@ struct winsize {
(struct cmsghdr *)NULL)
#endif /* CMSG_FIRSTHDR */
-#ifndef offsetof
+#if defined(HAVE_DECL_OFFSETOF) && HAVE_DECL_OFFSETOF == 0
# define offsetof(type, member) ((size_t) &((type *)0)->member)
#endif