summaryrefslogtreecommitdiffstats
path: root/sys/i386/include/param.h
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2009-09-08 20:45:40 +0000
committerphk <phk@FreeBSD.org>2009-09-08 20:45:40 +0000
commite645b495eda0a345c1b9caa5f932817c25234633 (patch)
treee7b582548488a3ceddf28413807147ffef4e2857 /sys/i386/include/param.h
parentaead28d158d987de2bf0e3069685beb09741b21f (diff)
downloadFreeBSD-src-e645b495eda0a345c1b9caa5f932817c25234633.zip
FreeBSD-src-e645b495eda0a345c1b9caa5f932817c25234633.tar.gz
Get rid of the _NO_NAMESPACE_POLLUTION kludge by creating an
architecture specific include file containing the _ALIGN* stuff which <sys/socket.h> needs.
Diffstat (limited to 'sys/i386/include/param.h')
-rw-r--r--sys/i386/include/param.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index 2bcbaf4..b6a527d 100644
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
@@ -33,6 +33,11 @@
* $FreeBSD$
*/
+#include <machine/_align.h>
+
+#ifndef _I386_INCLUDE_PARAM_H_
+#define _I386_INCLUDE_PARAM_H_
+
/*
* Machine dependent constants for Intel 386.
*/
@@ -49,14 +54,10 @@
#define _ALIGN(p) (((unsigned)(p) + _ALIGNBYTES) & ~_ALIGNBYTES)
#endif
-#ifndef _NO_NAMESPACE_POLLUTION
#define __HAVE_ACPI
#define __PCI_REROUTE_INTERRUPT
-#ifndef _MACHINE_PARAM_H_
-#define _MACHINE_PARAM_H_
-
#ifndef MACHINE
#define MACHINE "i386"
#endif
@@ -149,5 +150,4 @@
#define pgtok(x) ((x) * (PAGE_SIZE / 1024))
-#endif /* !_MACHINE_PARAM_H_ */
-#endif /* !_NO_NAMESPACE_POLLUTION */
+#endif /* !_I386_INCLUDE_PARAM_H_ */
OpenPOWER on IntegriCloud