From ce21f1129643bf6f9bcc6a4ccc56629d2215ca06 Mon Sep 17 00:00:00 2001
From: guenther <>
Date: Sun, 12 Mar 2017 23:28:14 +0000
Subject: [PATCH] <struct.h> is unused and should not be used.  Delete it.

ok millert@ deraadt@ kettenis@
---
 src/include/Makefile |  4 ++--
 src/include/struct.h | 50 --------------------------------------------
 2 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100644 src/include/struct.h

diff --git a/src/include/Makefile b/src/include/Makefile
index a2e53761..8f9f24fc 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.217 2017/01/27 13:30:39 jsg Exp $
+#	$OpenBSD: Makefile,v 1.218 2017/03/12 23:28:13 guenther Exp $
 #	$NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
 
 #	@(#)Makefile	5.45.1.1 (Berkeley) 5/6/91
@@ -18,7 +18,7 @@ FILES=	a.out.h ar.h asr.h assert.h bitstring.h blf.h bsd_auth.h \
 	nlist.h nl_types.h paths.h poll.h pwd.h ranlib.h readpassphrase.h \
 	regex.h resolv.h rmd160.h search.h setjmp.h sha1.h sha2.h signal.h \
 	siphash.h sndio.h spawn.h stdbool.h stddef.h stdio.h stdlib.h \
-	string.h strings.h struct.h sysexits.h tar.h tgmath.h tib.h time.h \
+	string.h strings.h sysexits.h tar.h tgmath.h tib.h time.h \
 	ttyent.h unistd.h utime.h utmp.h uuid.h vis.h wchar.h wctype.h
 
 MFILES=	frame.h
diff --git a/src/include/struct.h b/src/include/struct.h
deleted file mode 100644
index 85e3d269..00000000
--- a/src/include/struct.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$OpenBSD: struct.h,v 1.3 2003/06/02 19:34:12 millert Exp $	*/
-/*	$NetBSD: struct.h,v 1.3 1994/10/26 00:56:32 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)struct.h	5.2 (Berkeley) 4/3/91
- */
-
-#ifndef _STRUCT_H_
-#define	_STRUCT_H_
-
-/* Offset of the field in the structure. */
-#define	fldoff(name, field) \
-	((int)&(((struct name *)0)->field))
-
-/* Size of the field in the structure. */
-#define	fldsiz(name, field) \
-	(sizeof(((struct name *)0)->field))
-
-/* Address of the structure from a field. */
-#define	strbase(name, addr, field) \
-	((struct name *)((char *)(addr) - fldoff(name, field)))
-
-#endif /* !_STRUCT_H_ */