diff options
| author | phk <phk@FreeBSD.org> | 2009-09-08 20:45:40 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2009-09-08 20:45:40 +0000 |
| commit | e645b495eda0a345c1b9caa5f932817c25234633 (patch) | |
| tree | e7b582548488a3ceddf28413807147ffef4e2857 /sys/ia64/include/param.h | |
| parent | aead28d158d987de2bf0e3069685beb09741b21f (diff) | |
| download | FreeBSD-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/ia64/include/param.h')
| -rw-r--r-- | sys/ia64/include/param.h | 22 |
1 files changed, 5 insertions, 17 deletions
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_ */ |
