From 4ef4170e6410b5fc82fbd02c99ad3c27156d0b88 Mon Sep 17 00:00:00 2001
From: "Viral B. Shah" <viral@mayin.org>
Date: Sat, 27 Feb 2016 19:52:44 +0530
Subject: [PATCH] Change some #ifdefs to be different than the system ones.

---
 amd64/bsd_asm.h    | 6 +++---
 amd64/bsd_cdefs.h  | 6 +++---
 amd64/bsd_fpu.h    | 6 +++---
 amd64/bsd_ieeefp.h | 6 +++---
 i387/bsd_cdefs.h   | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/amd64/bsd_asm.h b/amd64/bsd_asm.h
index c462fb3..619f448 100644
--- a/amd64/bsd_asm.h
+++ b/amd64/bsd_asm.h
@@ -33,8 +33,8 @@
  * $FreeBSD: src/sys/amd64/include/asm.h,v 1.18 2007/08/22 04:26:07 jkoshy Exp $
  */
 
-#ifndef _MACHINE_ASM_H_
-#define	_MACHINE_ASM_H_
+#ifndef _BSD_ASM_H_
+#define _BSD_ASM_H_
 
 #ifdef __APPLE__
 #include "../i387/osx_asm.h"
@@ -107,4 +107,4 @@
 #endif /* not lint and not STRIP_FBSDID */
 
 #endif
-#endif /* !_MACHINE_ASM_H_ */
+#endif /* !_BSD_ASM_H_ */
diff --git a/amd64/bsd_cdefs.h b/amd64/bsd_cdefs.h
index 58801b2..446e36d 100644
--- a/amd64/bsd_cdefs.h
+++ b/amd64/bsd_cdefs.h
@@ -33,8 +33,8 @@
  * $FreeBSD: src/sys/sys/cdefs.h,v 1.114 2011/02/18 21:44:53 nwhitehorn Exp $
  */
 
-#ifndef	_SYS_CDEFS_H_
-#define	_SYS_CDEFS_H_
+#ifndef	_BSD_CDEFS_H_
+#define	_BSD_CDEFS_H_
 
 #if defined(__cplusplus)
 #define	__BEGIN_DECLS	extern "C" {
@@ -574,4 +574,4 @@
 #endif
 #endif
 
-#endif /* !_SYS_CDEFS_H_ */
+#endif /* !_BSD_CDEFS_H_ */
diff --git a/amd64/bsd_fpu.h b/amd64/bsd_fpu.h
index afe5b6b..513b345 100644
--- a/amd64/bsd_fpu.h
+++ b/amd64/bsd_fpu.h
@@ -38,8 +38,8 @@
  * W. Jolitz 1/90
  */
 
-#ifndef _X86_FPU_H_
-#define	_X86_FPU_H_
+#ifndef _BSD_FPU_H_
+#define	_BSD_FPU_H_
 
 #include "types-compat.h"
 
@@ -215,4 +215,4 @@ struct savefpu_ymm {
 #define	__INITIAL_MXCSR__	0x1F80
 #define	__INITIAL_MXCSR_MASK__	0xFFBF
 
-#endif /* !_X86_FPU_H_ */
+#endif /* !_BSD_FPU_H_ */
diff --git a/amd64/bsd_ieeefp.h b/amd64/bsd_ieeefp.h
index 8a7ee20..6103d50 100644
--- a/amd64/bsd_ieeefp.h
+++ b/amd64/bsd_ieeefp.h
@@ -35,8 +35,8 @@
  *	IEEE floating point type and constant definitions.
  */
 
-#ifndef _MACHINE_IEEEFP_H_
-#define _MACHINE_IEEEFP_H_
+#ifndef _BSD_IEEEFP_H_
+#define _BSD_IEEEFP_H_
 
 /*
  * FP rounding modes
@@ -269,4 +269,4 @@ __END_DECLS
 #endif /* !__IEEEFP_NOINLINES__ && !__cplusplus && __GNUCLIKE_ASM
           && __CC_SUPPORTS___INLINE__ */
 
-#endif /* !_MACHINE_IEEEFP_H_ */
+#endif /* !_BSD_IEEEFP_H_ */
diff --git a/i387/bsd_cdefs.h b/i387/bsd_cdefs.h
index 58801b2..446e36d 100644
--- a/i387/bsd_cdefs.h
+++ b/i387/bsd_cdefs.h
@@ -33,8 +33,8 @@
  * $FreeBSD: src/sys/sys/cdefs.h,v 1.114 2011/02/18 21:44:53 nwhitehorn Exp $
  */
 
-#ifndef	_SYS_CDEFS_H_
-#define	_SYS_CDEFS_H_
+#ifndef	_BSD_CDEFS_H_
+#define	_BSD_CDEFS_H_
 
 #if defined(__cplusplus)
 #define	__BEGIN_DECLS	extern "C" {
@@ -574,4 +574,4 @@
 #endif
 #endif
 
-#endif /* !_SYS_CDEFS_H_ */
+#endif /* !_BSD_CDEFS_H_ */