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/amd64/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/amd64/include/param.h')
| -rw-r--r-- | sys/amd64/include/param.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h index 746ba30..f9b6bd8 100644 --- a/sys/amd64/include/param.h +++ b/sys/amd64/include/param.h @@ -39,26 +39,16 @@ * $FreeBSD$ */ + #ifndef _AMD64_INCLUDE_PARAM_H_ #define _AMD64_INCLUDE_PARAM_H_ -/* - * Machine dependent constants for AMD64. - */ +#include <machine/_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. + * Machine dependent constants for AMD64. */ -#ifndef _ALIGNBYTES -#define _ALIGNBYTES (sizeof(long) - 1) -#endif -#ifndef _ALIGN -#define _ALIGN(p) (((u_long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES) -#endif -#ifndef _NO_NAMESPACE_POLLUTION #define __HAVE_ACPI #define __PCI_REROUTE_INTERRUPT @@ -150,5 +140,4 @@ #define pgtok(x) ((unsigned long)(x) * (PAGE_SIZE / 1024)) -#endif /* !_NO_NAMESPACE_POLLUTION */ #endif /* !_AMD64_INCLUDE_PARAM_H_ */ |
