Debugger: fix build after hrev54931

headers/os/arch/x86_64/arch_debugger.h

@@ -6,9 +6,6 @@
 #define _ARCH_X86_64_DEBUGGER_H
 
 
-#if __x86_64__
-
-
 #include <posix/arch/x86_64/signal.h>
 
 
@@ -44,7 +41,4 @@ struct x86_64_debug_cpu_state {
 } __attribute__((aligned(16)));
 
 
-#endif
-
-
 #endif	// _ARCH_X86_64_DEBUGGER_H

headers/posix/arch/arm/signal.h

@@ -2,8 +2,8 @@
  * Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _ARCH_SIGNAL_H_
-#define _ARCH_SIGNAL_H_
+#ifndef _ARCH_ARM_SIGNAL_H_
+#define _ARCH_ARM_SIGNAL_H_
 
 
 /*
@@ -35,4 +35,4 @@ struct vregs
 #endif /* defined(__arm__) */
 
 
-#endif /* _ARCH_SIGNAL_H_ */
+#endif /* _ARCH_ARM_SIGNAL_H_ */

headers/posix/arch/arm64/signal.h

@@ -3,8 +3,8 @@
  * Distributed under the terms of the MIT License.
  */
 
-#ifndef _ARCH_SIGNAL_H_
-#define _ARCH_SIGNAL_H_
+#ifndef _ARCH_ARM64_SIGNAL_H_
+#define _ARCH_ARM64_SIGNAL_H_
 
 
 /*
@@ -26,4 +26,4 @@ struct vregs
 #endif /* defined(__aarch64__) */
 
 
-#endif /* _ARCH_SIGNAL_H_ */
+#endif /* _ARCH_ARM64_SIGNAL_H_ */

headers/posix/arch/m68k/signal.h

@@ -2,8 +2,8 @@
  * Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _ARCH_SIGNAL_H_
-#define _ARCH_SIGNAL_H_
+#ifndef _ARCH_M68K_SIGNAL_H_
+#define _ARCH_M68K_SIGNAL_H_
 
 
 /*
@@ -24,4 +24,4 @@ struct vregs
 #endif /* __M68K__ */
 
 
-#endif /* _ARCH_SIGNAL_H_ */
+#endif /* _ARCH_M68K_SIGNAL_H_ */

headers/posix/arch/mipsel/signal.h

@@ -2,8 +2,8 @@
  * Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _ARCH_SIGNAL_H_
-#define _ARCH_SIGNAL_H_
+#ifndef _ARCH_MIPSEL_SIGNAL_H_
+#define _ARCH_MIPSEL_SIGNAL_H_
 
 
 /*
@@ -21,4 +21,4 @@ struct vregs
 #endif /* __MIPSEL__ */
 
 
-#endif /* _ARCH_SIGNAL_H_ */
+#endif /* _ARCH_MIPSEL_SIGNAL_H_ */

headers/posix/arch/ppc/signal.h

@@ -2,8 +2,8 @@
  * Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _ARCH_SIGNAL_H_
-#define _ARCH_SIGNAL_H_
+#ifndef _ARCH_PPC_SIGNAL_H_
+#define _ARCH_PPC_SIGNAL_H_
 
 
 /*
@@ -30,4 +30,4 @@ struct vregs
 #endif /* __POWERPC__ */
 
 
-#endif /* _ARCH_SIGNAL_H_ */
+#endif /* _ARCH_PPC_SIGNAL_H_ */

headers/posix/arch/riscv64/signal.h

@@ -2,8 +2,8 @@
  * Copyright 2018-2019 Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _ARCH_SIGNAL_H_
-#define _ARCH_SIGNAL_H_
+#ifndef _ARCH_RISCV64_SIGNAL_H_
+#define _ARCH_RISCV64_SIGNAL_H_
 
 
 /*
@@ -21,4 +21,4 @@ struct vregs {
 #endif /* defined(__RISCV64__) */
 
 
-#endif /* _ARCH_SIGNAL_H_ */
+#endif /* _ARCH_RISCV64_SIGNAL_H_ */

headers/posix/arch/sparc64/signal.h

@@ -2,8 +2,8 @@
  * Copyright 2019 Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _ARCH_SIGNAL_H_
-#define _ARCH_SIGNAL_H_
+#ifndef _ARCH_SPARC64_SIGNAL_H_
+#define _ARCH_SPARC64_SIGNAL_H_
 
 
 /*
@@ -52,4 +52,4 @@ struct vregs
 
 #endif /* __sparc64__ */
 
-#endif /* _ARCH_SIGNAL_H_ */
+#endif /* _ARCH_SPARC64_SIGNAL_H_ */

headers/posix/arch/x86/signal.h

@@ -2,8 +2,8 @@
  * Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _ARCH_SIGNAL_H_
-#define _ARCH_SIGNAL_H_
+#ifndef _ARCH_X86_SIGNAL_H_
+#define _ARCH_X86_SIGNAL_H_
 
 
 /*
@@ -148,4 +148,4 @@ struct vregs {
 
 #endif /* __i386__ */
 
-#endif /* _ARCH_SIGNAL_H_ */
+#endif /* _ARCH_X86_SIGNAL_H_ */

headers/posix/arch/x86_64/signal.h

@@ -2,15 +2,14 @@
  * Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _ARCH_SIGNAL_H_
-#define _ARCH_SIGNAL_H_
+#ifndef _ARCH_X86_64_SIGNAL_H_
+#define _ARCH_X86_64_SIGNAL_H_
 
 
 /*
  * Architecture-specific structure passed to signal handlers
  */
 
-#if __x86_64__
 
 struct x86_64_fp_register {
 	unsigned char value[10];
@@ -62,6 +61,9 @@ struct savefpu {
 };
 
 
+#ifdef __x86_64__
+
+
 struct vregs {
 	unsigned long		rax;
 	unsigned long		rbx;
@@ -87,6 +89,7 @@ struct vregs {
 };
 
 
-#endif /* __x86_64__ */
+#endif
 
-#endif /* _ARCH_SIGNAL_H_ */
+
+#endif /* _ARCH_X86_64_SIGNAL_H_ */