Provide namespace-safe alignment macros in <machine/_types.h>, with

compat names kept in <machine/param.h>.  In <sys/socket.h>, pull
in <sys/_types.h> instead of the namespace polluting <machine/param.h>
and completely eliminate __CMSG_ALIGN, replaced by _ALIGN

ok deraadt@

2 files changed, 19 insertions, 10 deletions

diff --git a/sys/arch/hppa/include/_types.h b/sys/arch/hppa/include/_types.h
index a8293327c7f..6e77c4429a8 100644
--- a/sys/arch/hppa/include/_types.h
+++ b/sys/arch/hppa/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.13 2011/09/08 02:47:13 guenther Exp $	*/
+/*	$OpenBSD: _types.h,v 1.14 2011/09/08 03:40:32 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -45,6 +45,20 @@ typedef struct label_t {
 } label_t;
 #endif
 
+/*
+ * _ALIGN(p) rounds p (pointer or byte index) up to a correctly-aligned
+ * value for all data types (int, long, ...).   The result is an
+ * unsigned long and must be cast to any desired pointer type.
+ *
+ * _ALIGNED_POINTER is a boolean macro that checks whether an address
+ * is valid to fetch data elements of type t from on this architecture.
+ * This does not reflect the optimal alignment, just the possibility
+ * (within reasonable limits).
+ */
+#define	_ALIGNBYTES	7
+#define	_ALIGN(p)	(((unsigned long)(p) + _ALIGNBYTES) & ~_ALIGNBYTES)
+#define	_ALIGNED_POINTER(p,t)	((((unsigned long)(p)) & (sizeof(t) - 1)) == 0)
+
 typedef unsigned long		hppa_hpa_t;	/* XXX */
 typedef unsigned long		hppa_spa_t;	/* XXX */
 typedef unsigned int		pa_space_t;	/* XXX */
diff --git a/sys/arch/hppa/include/param.h b/sys/arch/hppa/include/param.h
index 56a137d65e2..62bc1581785 100644
--- a/sys/arch/hppa/include/param.h
+++ b/sys/arch/hppa/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.40 2011/04/07 15:45:17 miod Exp $	*/
+/*	$OpenBSD: param.h,v 1.41 2011/09/08 03:40:32 guenther Exp $	*/
 
 /* 
  * Copyright (c) 1988-1994, The University of Utah and
@@ -36,14 +36,9 @@
 #define	MACHINE_ARCH	"hppa"
 #define	MID_MACHINE	MID_HPUX800
 
-/*
- * 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	7
-#define	ALIGN(p)	(((u_long)(p) + ALIGNBYTES) &~ ALIGNBYTES)
-#define	ALIGNED_POINTER(p,t) ((((u_long)(p)) & (sizeof(t) - 1)) == 0)
+#define	ALIGNBYTES		_ALIGNBYTES
+#define	ALIGN(p)		_ALIGN(p)
+#define	ALIGNED_POINTER(p,t)	_ALIGNED_POINTER(p,t)
 
 #define	PAGE_SIZE	4096
 #define	PAGE_MASK	(PAGE_SIZE-1)