Get rid of the _NO_NAMESPACE_POLLUTION kludge by creating an

architecture specific include file containing the _ALIGN*
stuff which <sys/socket.h> needs.

2 files changed, 58 insertions, 17 deletions

diff --git a/sys/ia64/include/_align.h b/sys/ia64/include/_align.h
new file mode 100644
index 0000000..26df35b
--- /dev/null
+++ b/sys/ia64/include/_align.h
@@ -0,0 +1,53 @@
+/* $FreeBSD$ */
+/* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
+
+/*-
+ * Copyright (c) 1988 University of Utah.
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department and Ralph Campbell.
+ *
+ * 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.
+ * 4. 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.
+ *
+ * from: Utah $Hdr: machparam.h 1.11 89/08/14$
+ *
+ *	@(#)param.h	8.1 (Berkeley) 6/10/93
+ */
+
+#ifndef _IA64_INCLUDE__ALIGN_H_
+#define	_IA64_INCLUDE__ALIGN_H_
+
+/*
+ * Round p (pointer or byte index) up to a correctly-aligned value for all
+ * data types (int, long, ...).   The result is u_long and must be cast to
+ * any desired pointer type.
+ */
+#define	_ALIGNBYTES		15
+#define	_ALIGN(p)		(((u_long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES)
+
+#endif /* !_IA64_INCLUDE__ALIGN_H_ */
diff --git a/sys/ia64/include/param.h b/sys/ia64/include/param.h
index cb805a6..8518020 100644
--- a/sys/ia64/include/param.h
+++ b/sys/ia64/include/param.h
@@ -39,29 +39,18 @@
  *	@(#)param.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _IA64_INCLUDE_PARAM_H_
+#define	_IA64_INCLUDE_PARAM_H_
+
 /*
  * Machine dependent constants for the IA64.
  */
-/*
- * Round p (pointer or byte index) up to a correctly-aligned value for all
- * data types (int, long, ...).   The result is u_long and must be cast to
- * any desired pointer type.
- */
-#ifndef _ALIGNBYTES
-#define	_ALIGNBYTES		15
-#endif
-#ifndef _ALIGN
-#define	_ALIGN(p)		(((u_long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES)
-#endif
 
-#ifndef _NO_NAMESPACE_POLLUTION
+#include <machine/_align.h>
 
 #define __HAVE_ACPI
 #define __PCI_REROUTE_INTERRUPT
 
-#ifndef _MACHINE_PARAM_H_
-#define	_MACHINE_PARAM_H_
-
 #ifndef MACHINE
 #define	MACHINE		"ia64"
 #endif
@@ -119,5 +108,4 @@
 
 #define pgtok(x)                ((x) * (PAGE_SIZE / 1024)) 
 
-#endif	/* !_MACHINE_PARAM_H_ */
-#endif	/* !_NO_NAMESPACE_POLLUTION */
+#endif	/* !_IA64_INCLUDE_PARAM_H_ */