From: deraadt <deraadt@openbsd.org>
Date: Fri, 16 Jan 2015 16:25:50 +0000 (+0000)
Subject: More evil bootstrap code.  #ifndef ALIGNBYTES  #define ALIGNBYTES 3.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=72f0c189441f47c4c24a691868beacab04c91b70;p=openbsd

More evil bootstrap code.  #ifndef ALIGNBYTES  #define ALIGNBYTES 3.
Which makes this code go all wrong depending on where a system has put
their things like ALIGNBYTES.
Delete with prejudice.  When someone needs to compile this in another
environment, they need to face this hurdle, and maybe change the
embedded memory allocator...
---

diff --git a/usr.sbin/config/hash.c b/usr.sbin/config/hash.c
index e9fda768a6b..d387c27a52d 100644
--- a/usr.sbin/config/hash.c
+++ b/usr.sbin/config/hash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash.c,v 1.16 2014/05/18 09:29:54 espie Exp $	*/
+/*	$OpenBSD: hash.c,v 1.17 2015/01/16 16:25:50 deraadt Exp $	*/
 /*	$NetBSD: hash.c,v 1.4 1996/11/07 22:59:43 gwr Exp $	*/
 
 /*
@@ -48,17 +48,6 @@
 
 #include "config.h"
 
-/*
- * These are really for MAKE_BOOTSTRAP but harmless.
- * XXX - Why not just use malloc in here, anyway?
- */
-#ifndef	ALIGNBYTES
-#define	ALIGNBYTES 3
-#endif
-#ifndef ALIGN
-#define	ALIGN(p)	(((long)(p) + ALIGNBYTES) &~ ALIGNBYTES)
-#endif
-
 /*
  * Interned strings are kept in a hash table.  By making each string
  * unique, the program can compare strings by comparing pointers.