1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
From a9f892b5fa95d0df6ea501f8fd8ada8dd2e5f494 Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Sun, 27 Sep 2015 14:40:02 +0200
Subject: [PATCH gnumach 2/2] Fix build with -DDEBUG
* device/cirbuf.c: Add missing include.
* i386/i386/debug.h (dump_ss): Hide declaration from assembler.
* i386/i386/debug_i386.c: Fix include.
* kern/sched_prim.h: Add missing include, fix declaration.
---
device/cirbuf.c | 2 ++
i386/i386/debug.h | 2 ++
i386/i386/debug_i386.c | 2 +-
kern/sched_prim.h | 4 +++-
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/device/cirbuf.c b/device/cirbuf.c
index dfb06df..391297c 100644
--- a/device/cirbuf.c
+++ b/device/cirbuf.c
@@ -42,6 +42,8 @@
/* if c_cl == c_cf - 1, buffer is full */
#if DEBUG
+#include <mach/boolean.h>
+
boolean_t cb_check_enable = FALSE;
#define CB_CHECK(cb) if (cb_check_enable) cb_check(cb)
diff --git a/i386/i386/debug.h b/i386/i386/debug.h
index e94649b..84397ba 100644
--- a/i386/i386/debug.h
+++ b/i386/i386/debug.h
@@ -23,10 +23,12 @@
#ifndef _I386_DEBUG_
#define _I386_DEBUG_
+#ifndef __ASSEMBLER__
/* Dump a saved state.
Probably a good idea to have this around
even when DEBUG isn't turned on. */
void dump_ss(const struct i386_saved_state *st);
+#endif /* __ASSEMBLER__ */
#ifdef DEBUG
diff --git a/i386/i386/debug_i386.c b/i386/i386/debug_i386.c
index 7657808..f0fe2ae 100644
--- a/i386/i386/debug_i386.c
+++ b/i386/i386/debug_i386.c
@@ -128,7 +128,7 @@ debug_trace_dump(void)
splx(s);
}
-#include "syscall_sw.h"
+#include <kern/syscall_sw.h>
int syscall_trace = 0;
diff --git a/kern/sched_prim.h b/kern/sched_prim.h
index 8b3f14b..4ba45e3 100644
--- a/kern/sched_prim.h
+++ b/kern/sched_prim.h
@@ -180,7 +180,9 @@ void do_thread_scan(void);
thread_t choose_pset_thread(processor_t myprocessor, processor_set_t pset);
#if DEBUG
-void checkrq(run_queue_t rq, char *msg);
+#include <kern/sched.h> /* for run_queue_t */
+
+void checkrq(run_queue_t rq, const char *msg);
void thread_check(thread_t th, run_queue_t rq);
#endif /* DEBUG */
--
2.1.4
|
