[src/netbsd-1-5]: src/sys/lib/libkern Pullup 1.31 [msaitoh]:

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4b6ed655eeb8
branches:  netbsd-1-5
changeset: 490143:4b6ed655eeb8
user:      tv <tv%NetBSD.org@localhost>
date:      Sun Nov 05 00:50:21 2000 +0000

description:
Pullup 1.31 [msaitoh]:
enclose offsetof macro definition with #ifndef offsetof ... #endif

diffstat:

 sys/lib/libkern/libkern.h |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r ea86227c8413 -r 4b6ed655eeb8 sys/lib/libkern/libkern.h
--- a/sys/lib/libkern/libkern.h Sat Nov 04 21:04:05 2000 +0000
+++ b/sys/lib/libkern/libkern.h Sun Nov 05 00:50:21 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: libkern.h,v 1.30 2000/05/08 23:33:15 thorpej Exp $     */
+/*     $NetBSD: libkern.h,v 1.30.4.1 2000/11/05 00:50:21 tv Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -149,7 +149,9 @@
 #endif
 #endif
 
+#ifndef offsetof
 #define        offsetof(type, member)  ((size_t)(&((type *)0)->member))
+#endif
 
 /* Prototypes for non-quad routines. */
 void    __assert __P((const char *, const char *, int, const char *))