Skip to content

Commit 1a5c259

Browse files
tromeytromey
committed
Normalize include guards in gdb
While working on my other scripts to deal with gdb headers, I noticed that some files were missing include guards. I wrote a script to add the missing ones, but found that using the obvious names for the guards ran into clashes -- for example, gdb/nat/linux-nat.h used "LINUX_NAT_H", but this was also the script's choice for gdb/linux-nat.h. So, I changed the script to normalize all include guards in gdb. This patch is the result. As usual the script is available here: https://github.com/tromey/gdb-refactoring-scripts Tested by rebuilding; I also ran it through "Fedora-x86_64-m64" on the buildbot. gdb/ChangeLog 2019-02-07 Tom Tromey <[email protected]> * yy-remap.h: Add include guard. * xtensa-tdep.h: Add include guard. * xcoffread.h: Rename include guard. * varobj-iter.h: Add include guard. * tui/tui.h: Rename include guard. * tui/tui-winsource.h: Rename include guard. * tui/tui-wingeneral.h: Rename include guard. * tui/tui-windata.h: Rename include guard. * tui/tui-win.h: Rename include guard. * tui/tui-stack.h: Rename include guard. * tui/tui-source.h: Rename include guard. * tui/tui-regs.h: Rename include guard. * tui/tui-out.h: Rename include guard. * tui/tui-layout.h: Rename include guard. * tui/tui-io.h: Rename include guard. * tui/tui-hooks.h: Rename include guard. * tui/tui-file.h: Rename include guard. * tui/tui-disasm.h: Rename include guard. * tui/tui-data.h: Rename include guard. * tui/tui-command.h: Rename include guard. * tic6x-tdep.h: Add include guard. * target/waitstatus.h: Rename include guard. * target/wait.h: Rename include guard. * target/target.h: Rename include guard. * target/resume.h: Rename include guard. * target-float.h: Rename include guard. * stabsread.h: Add include guard. * rs6000-tdep.h: Add include guard. * riscv-fbsd-tdep.h: Add include guard. * regformats/regdef.h: Rename include guard. * record.h: Rename include guard. * python/python.h: Rename include guard. * python/python-internal.h: Rename include guard. * python/py-stopevent.h: Rename include guard. * python/py-ref.h: Rename include guard. * python/py-record.h: Rename include guard. * python/py-record-full.h: Rename include guard. * python/py-record-btrace.h: Rename include guard. * python/py-instruction.h: Rename include guard. * python/py-events.h: Rename include guard. * python/py-event.h: Rename include guard. * procfs.h: Add include guard. * proc-utils.h: Add include guard. * p-lang.h: Add include guard. * or1k-tdep.h: Rename include guard. * observable.h: Rename include guard. * nto-tdep.h: Rename include guard. * nat/x86-linux.h: Rename include guard. * nat/x86-linux-dregs.h: Rename include guard. * nat/x86-gcc-cpuid.h: Add include guard. * nat/x86-dregs.h: Rename include guard. * nat/x86-cpuid.h: Rename include guard. * nat/ppc-linux.h: Rename include guard. * nat/mips-linux-watch.h: Rename include guard. * nat/linux-waitpid.h: Rename include guard. * nat/linux-ptrace.h: Rename include guard. * nat/linux-procfs.h: Rename include guard. * nat/linux-osdata.h: Rename include guard. * nat/linux-nat.h: Rename include guard. * nat/linux-namespaces.h: Rename include guard. * nat/linux-btrace.h: Rename include guard. * nat/glibc_thread_db.h: Rename include guard. * nat/gdb_thread_db.h: Rename include guard. * nat/gdb_ptrace.h: Rename include guard. * nat/fork-inferior.h: Rename include guard. * nat/amd64-linux-siginfo.h: Rename include guard. * nat/aarch64-sve-linux-sigcontext.h: Rename include guard. * nat/aarch64-sve-linux-ptrace.h: Rename include guard. * nat/aarch64-linux.h: Rename include guard. * nat/aarch64-linux-hw-point.h: Rename include guard. * mn10300-tdep.h: Add include guard. * mips-linux-tdep.h: Add include guard. * mi/mi-parse.h: Rename include guard. * mi/mi-out.h: Rename include guard. * mi/mi-main.h: Rename include guard. * mi/mi-interp.h: Rename include guard. * mi/mi-getopt.h: Rename include guard. * mi/mi-console.h: Rename include guard. * mi/mi-common.h: Rename include guard. * mi/mi-cmds.h: Rename include guard. * mi/mi-cmd-break.h: Rename include guard. * m2-lang.h: Add include guard. * location.h: Rename include guard. * linux-record.h: Rename include guard. * linux-nat.h: Add include guard. * linux-fork.h: Add include guard. * i386-darwin-tdep.h: Rename include guard. * hppa-linux-offsets.h: Add include guard. * guile/guile.h: Rename include guard. * guile/guile-internal.h: Rename include guard. * gnu-nat.h: Rename include guard. * gdb-stabs.h: Rename include guard. * frv-tdep.h: Add include guard. * f-lang.h: Add include guard. * event-loop.h: Add include guard. * darwin-nat.h: Rename include guard. * cp-abi.h: Rename include guard. * config/sparc/nm-sol2.h: Rename include guard. * config/nm-nto.h: Rename include guard. * config/nm-linux.h: Add include guard. * config/i386/nm-i386gnu.h: Rename include guard. * config/djgpp/nl_types.h: Rename include guard. * config/djgpp/langinfo.h: Rename include guard. * compile/gcc-cp-plugin.h: Add include guard. * compile/gcc-c-plugin.h: Add include guard. * compile/compile.h: Rename include guard. * compile/compile-object-run.h: Rename include guard. * compile/compile-object-load.h: Rename include guard. * compile/compile-internal.h: Rename include guard. * compile/compile-cplus.h: Rename include guard. * compile/compile-c.h: Rename include guard. * common/xml-utils.h: Rename include guard. * common/x86-xstate.h: Rename include guard. * common/version.h: Rename include guard. * common/vec.h: Rename include guard. * common/tdesc.h: Rename include guard. * common/selftest.h: Rename include guard. * common/scoped_restore.h: Rename include guard. * common/scoped_mmap.h: Rename include guard. * common/scoped_fd.h: Rename include guard. * common/safe-iterator.h: Rename include guard. * common/run-time-clock.h: Rename include guard. * common/refcounted-object.h: Rename include guard. * common/queue.h: Rename include guard. * common/ptid.h: Rename include guard. * common/print-utils.h: Rename include guard. * common/preprocessor.h: Rename include guard. * common/pathstuff.h: Rename include guard. * common/observable.h: Rename include guard. * common/netstuff.h: Rename include guard. * common/job-control.h: Rename include guard. * common/host-defs.h: Rename include guard. * common/gdb_wait.h: Rename include guard. * common/gdb_vecs.h: Rename include guard. * common/gdb_unlinker.h: Rename include guard. * common/gdb_unique_ptr.h: Rename include guard. * common/gdb_tilde_expand.h: Rename include guard. * common/gdb_sys_time.h: Rename include guard. * common/gdb_string_view.h: Rename include guard. * common/gdb_splay_tree.h: Rename include guard. * common/gdb_setjmp.h: Rename include guard. * common/gdb_ref_ptr.h: Rename include guard. * common/gdb_optional.h: Rename include guard. * common/gdb_locale.h: Rename include guard. * common/gdb_assert.h: Rename include guard. * common/filtered-iterator.h: Rename include guard. * common/filestuff.h: Rename include guard. * common/fileio.h: Rename include guard. * common/environ.h: Rename include guard. * common/common-utils.h: Rename include guard. * common/common-types.h: Rename include guard. * common/common-regcache.h: Rename include guard. * common/common-inferior.h: Rename include guard. * common/common-gdbthread.h: Rename include guard. * common/common-exceptions.h: Rename include guard. * common/common-defs.h: Rename include guard. * common/common-debug.h: Rename include guard. * common/cleanups.h: Rename include guard. * common/buffer.h: Rename include guard. * common/btrace-common.h: Rename include guard. * common/break-common.h: Rename include guard. * cli/cli-utils.h: Rename include guard. * cli/cli-style.h: Rename include guard. * cli/cli-setshow.h: Rename include guard. * cli/cli-script.h: Rename include guard. * cli/cli-interp.h: Rename include guard. * cli/cli-decode.h: Rename include guard. * cli/cli-cmds.h: Rename include guard. * charset-list.h: Add include guard. * buildsym-legacy.h: Rename include guard. * bfin-tdep.h: Add include guard. * ax.h: Rename include guard. * arm-linux-tdep.h: Add include guard. * arm-fbsd-tdep.h: Add include guard. * arch/xtensa.h: Rename include guard. * arch/tic6x.h: Add include guard. * arch/i386.h: Add include guard. * arch/arm.h: Rename include guard. * arch/arm-linux.h: Rename include guard. * arch/arm-get-next-pcs.h: Rename include guard. * arch/amd64.h: Add include guard. * arch/aarch64-insn.h: Rename include guard. * arch-utils.h: Rename include guard. * annotate.h: Add include guard. * amd64-darwin-tdep.h: Rename include guard. * aarch64-linux-tdep.h: Add include guard. * aarch64-fbsd-tdep.h: Add include guard. * aarch32-linux-nat.h: Add include guard. gdb/gdbserver/ChangeLog 2019-02-07 Tom Tromey <[email protected]> * x86-tdesc.h: Rename include guard. * x86-low.h: Add include guard. * wincecompat.h: Rename include guard. * win32-low.h: Add include guard. * utils.h: Rename include guard. * tracepoint.h: Rename include guard. * tdesc.h: Rename include guard. * target.h: Rename include guard. * server.h: Rename include guard. * remote-utils.h: Rename include guard. * regcache.h: Rename include guard. * nto-low.h: Rename include guard. * notif.h: Add include guard. * mem-break.h: Rename include guard. * lynx-low.h: Add include guard. * linux-x86-tdesc.h: Add include guard. * linux-s390-tdesc.h: Add include guard. * linux-ppc-tdesc-init.h: Add include guard. * linux-low.h: Add include guard. * linux-aarch64-tdesc.h: Add include guard. * linux-aarch32-low.h: Add include guard. * inferiors.h: Rename include guard. * i387-fp.h: Rename include guard. * hostio.h: Rename include guard. * gdbthread.h: Rename include guard. * gdb_proc_service.h: Rename include guard. * event-loop.h: Rename include guard. * dll.h: Rename include guard. * debug.h: Rename include guard. * ax.h: Rename include guard.
1 parent 31528de commit 1a5c259

File tree

220 files changed

+974
-530
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+974
-530
lines changed

‎gdb/ChangeLog

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,194 @@
1+
2019-02-07 Tom Tromey <[email protected]>
2+
3+
* yy-remap.h: Add include guard.
4+
* xtensa-tdep.h: Add include guard.
5+
* xcoffread.h: Rename include guard.
6+
* varobj-iter.h: Add include guard.
7+
* tui/tui.h: Rename include guard.
8+
* tui/tui-winsource.h: Rename include guard.
9+
* tui/tui-wingeneral.h: Rename include guard.
10+
* tui/tui-windata.h: Rename include guard.
11+
* tui/tui-win.h: Rename include guard.
12+
* tui/tui-stack.h: Rename include guard.
13+
* tui/tui-source.h: Rename include guard.
14+
* tui/tui-regs.h: Rename include guard.
15+
* tui/tui-out.h: Rename include guard.
16+
* tui/tui-layout.h: Rename include guard.
17+
* tui/tui-io.h: Rename include guard.
18+
* tui/tui-hooks.h: Rename include guard.
19+
* tui/tui-file.h: Rename include guard.
20+
* tui/tui-disasm.h: Rename include guard.
21+
* tui/tui-data.h: Rename include guard.
22+
* tui/tui-command.h: Rename include guard.
23+
* tic6x-tdep.h: Add include guard.
24+
* target/waitstatus.h: Rename include guard.
25+
* target/wait.h: Rename include guard.
26+
* target/target.h: Rename include guard.
27+
* target/resume.h: Rename include guard.
28+
* target-float.h: Rename include guard.
29+
* stabsread.h: Add include guard.
30+
* rs6000-tdep.h: Add include guard.
31+
* riscv-fbsd-tdep.h: Add include guard.
32+
* regformats/regdef.h: Rename include guard.
33+
* record.h: Rename include guard.
34+
* python/python.h: Rename include guard.
35+
* python/python-internal.h: Rename include guard.
36+
* python/py-stopevent.h: Rename include guard.
37+
* python/py-ref.h: Rename include guard.
38+
* python/py-record.h: Rename include guard.
39+
* python/py-record-full.h: Rename include guard.
40+
* python/py-record-btrace.h: Rename include guard.
41+
* python/py-instruction.h: Rename include guard.
42+
* python/py-events.h: Rename include guard.
43+
* python/py-event.h: Rename include guard.
44+
* procfs.h: Add include guard.
45+
* proc-utils.h: Add include guard.
46+
* p-lang.h: Add include guard.
47+
* or1k-tdep.h: Rename include guard.
48+
* observable.h: Rename include guard.
49+
* nto-tdep.h: Rename include guard.
50+
* nat/x86-linux.h: Rename include guard.
51+
* nat/x86-linux-dregs.h: Rename include guard.
52+
* nat/x86-gcc-cpuid.h: Add include guard.
53+
* nat/x86-dregs.h: Rename include guard.
54+
* nat/x86-cpuid.h: Rename include guard.
55+
* nat/ppc-linux.h: Rename include guard.
56+
* nat/mips-linux-watch.h: Rename include guard.
57+
* nat/linux-waitpid.h: Rename include guard.
58+
* nat/linux-ptrace.h: Rename include guard.
59+
* nat/linux-procfs.h: Rename include guard.
60+
* nat/linux-osdata.h: Rename include guard.
61+
* nat/linux-nat.h: Rename include guard.
62+
* nat/linux-namespaces.h: Rename include guard.
63+
* nat/linux-btrace.h: Rename include guard.
64+
* nat/glibc_thread_db.h: Rename include guard.
65+
* nat/gdb_thread_db.h: Rename include guard.
66+
* nat/gdb_ptrace.h: Rename include guard.
67+
* nat/fork-inferior.h: Rename include guard.
68+
* nat/amd64-linux-siginfo.h: Rename include guard.
69+
* nat/aarch64-sve-linux-sigcontext.h: Rename include guard.
70+
* nat/aarch64-sve-linux-ptrace.h: Rename include guard.
71+
* nat/aarch64-linux.h: Rename include guard.
72+
* nat/aarch64-linux-hw-point.h: Rename include guard.
73+
* mn10300-tdep.h: Add include guard.
74+
* mips-linux-tdep.h: Add include guard.
75+
* mi/mi-parse.h: Rename include guard.
76+
* mi/mi-out.h: Rename include guard.
77+
* mi/mi-main.h: Rename include guard.
78+
* mi/mi-interp.h: Rename include guard.
79+
* mi/mi-getopt.h: Rename include guard.
80+
* mi/mi-console.h: Rename include guard.
81+
* mi/mi-common.h: Rename include guard.
82+
* mi/mi-cmds.h: Rename include guard.
83+
* mi/mi-cmd-break.h: Rename include guard.
84+
* m2-lang.h: Add include guard.
85+
* location.h: Rename include guard.
86+
* linux-record.h: Rename include guard.
87+
* linux-nat.h: Add include guard.
88+
* linux-fork.h: Add include guard.
89+
* i386-darwin-tdep.h: Rename include guard.
90+
* hppa-linux-offsets.h: Add include guard.
91+
* guile/guile.h: Rename include guard.
92+
* guile/guile-internal.h: Rename include guard.
93+
* gnu-nat.h: Rename include guard.
94+
* gdb-stabs.h: Rename include guard.
95+
* frv-tdep.h: Add include guard.
96+
* f-lang.h: Add include guard.
97+
* event-loop.h: Add include guard.
98+
* darwin-nat.h: Rename include guard.
99+
* cp-abi.h: Rename include guard.
100+
* config/sparc/nm-sol2.h: Rename include guard.
101+
* config/nm-nto.h: Rename include guard.
102+
* config/nm-linux.h: Add include guard.
103+
* config/i386/nm-i386gnu.h: Rename include guard.
104+
* config/djgpp/nl_types.h: Rename include guard.
105+
* config/djgpp/langinfo.h: Rename include guard.
106+
* compile/gcc-cp-plugin.h: Add include guard.
107+
* compile/gcc-c-plugin.h: Add include guard.
108+
* compile/compile.h: Rename include guard.
109+
* compile/compile-object-run.h: Rename include guard.
110+
* compile/compile-object-load.h: Rename include guard.
111+
* compile/compile-internal.h: Rename include guard.
112+
* compile/compile-cplus.h: Rename include guard.
113+
* compile/compile-c.h: Rename include guard.
114+
* common/xml-utils.h: Rename include guard.
115+
* common/x86-xstate.h: Rename include guard.
116+
* common/version.h: Rename include guard.
117+
* common/vec.h: Rename include guard.
118+
* common/tdesc.h: Rename include guard.
119+
* common/selftest.h: Rename include guard.
120+
* common/scoped_restore.h: Rename include guard.
121+
* common/scoped_mmap.h: Rename include guard.
122+
* common/scoped_fd.h: Rename include guard.
123+
* common/safe-iterator.h: Rename include guard.
124+
* common/run-time-clock.h: Rename include guard.
125+
* common/refcounted-object.h: Rename include guard.
126+
* common/queue.h: Rename include guard.
127+
* common/ptid.h: Rename include guard.
128+
* common/print-utils.h: Rename include guard.
129+
* common/preprocessor.h: Rename include guard.
130+
* common/pathstuff.h: Rename include guard.
131+
* common/observable.h: Rename include guard.
132+
* common/netstuff.h: Rename include guard.
133+
* common/job-control.h: Rename include guard.
134+
* common/host-defs.h: Rename include guard.
135+
* common/gdb_wait.h: Rename include guard.
136+
* common/gdb_vecs.h: Rename include guard.
137+
* common/gdb_unlinker.h: Rename include guard.
138+
* common/gdb_unique_ptr.h: Rename include guard.
139+
* common/gdb_tilde_expand.h: Rename include guard.
140+
* common/gdb_sys_time.h: Rename include guard.
141+
* common/gdb_string_view.h: Rename include guard.
142+
* common/gdb_splay_tree.h: Rename include guard.
143+
* common/gdb_setjmp.h: Rename include guard.
144+
* common/gdb_ref_ptr.h: Rename include guard.
145+
* common/gdb_optional.h: Rename include guard.
146+
* common/gdb_locale.h: Rename include guard.
147+
* common/gdb_assert.h: Rename include guard.
148+
* common/filtered-iterator.h: Rename include guard.
149+
* common/filestuff.h: Rename include guard.
150+
* common/fileio.h: Rename include guard.
151+
* common/environ.h: Rename include guard.
152+
* common/common-utils.h: Rename include guard.
153+
* common/common-types.h: Rename include guard.
154+
* common/common-regcache.h: Rename include guard.
155+
* common/common-inferior.h: Rename include guard.
156+
* common/common-gdbthread.h: Rename include guard.
157+
* common/common-exceptions.h: Rename include guard.
158+
* common/common-defs.h: Rename include guard.
159+
* common/common-debug.h: Rename include guard.
160+
* common/cleanups.h: Rename include guard.
161+
* common/buffer.h: Rename include guard.
162+
* common/btrace-common.h: Rename include guard.
163+
* common/break-common.h: Rename include guard.
164+
* cli/cli-utils.h: Rename include guard.
165+
* cli/cli-style.h: Rename include guard.
166+
* cli/cli-setshow.h: Rename include guard.
167+
* cli/cli-script.h: Rename include guard.
168+
* cli/cli-interp.h: Rename include guard.
169+
* cli/cli-decode.h: Rename include guard.
170+
* cli/cli-cmds.h: Rename include guard.
171+
* charset-list.h: Add include guard.
172+
* buildsym-legacy.h: Rename include guard.
173+
* bfin-tdep.h: Add include guard.
174+
* ax.h: Rename include guard.
175+
* arm-linux-tdep.h: Add include guard.
176+
* arm-fbsd-tdep.h: Add include guard.
177+
* arch/xtensa.h: Rename include guard.
178+
* arch/tic6x.h: Add include guard.
179+
* arch/i386.h: Add include guard.
180+
* arch/arm.h: Rename include guard.
181+
* arch/arm-linux.h: Rename include guard.
182+
* arch/arm-get-next-pcs.h: Rename include guard.
183+
* arch/amd64.h: Add include guard.
184+
* arch/aarch64-insn.h: Rename include guard.
185+
* arch-utils.h: Rename include guard.
186+
* annotate.h: Add include guard.
187+
* amd64-darwin-tdep.h: Rename include guard.
188+
* aarch64-linux-tdep.h: Add include guard.
189+
* aarch64-fbsd-tdep.h: Add include guard.
190+
* aarch32-linux-nat.h: Add include guard.
191+
1192
2019-02-06 Philippe Waroquiers <[email protected]>
2193

3194
* macrotab.c (macro_define_internal): New function that

‎gdb/aarch32-linux-nat.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
You should have received a copy of the GNU General Public License
1616
along with this program. If not, see <http://www.gnu.org/licenses/>. */
1717

18+
#ifndef AARCH32_LINUX_NAT_H
19+
#define AARCH32_LINUX_NAT_H
20+
1821
/* Fetch and store VFP Registers. The kernel object has space for 32
1922
64-bit registers, and the FPSCR. This is even when on a VFPv2 or
2023
VFPv3D16 target. */
@@ -32,3 +35,5 @@ void aarch32_vfp_regcache_supply (struct regcache *regcache, gdb_byte *regs,
3235
void aarch32_vfp_regcache_collect (const struct regcache *regcache,
3336
gdb_byte *regs,
3437
const int vfp_register_count);
38+
39+
#endif /* AARCH32_LINUX_NAT_H */

‎gdb/aarch64-fbsd-tdep.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
You should have received a copy of the GNU General Public License
1818
along with this program. If not, see <http://www.gnu.org/licenses/>. */
1919

20+
#ifndef AARCH64_FBSD_TDEP_H
21+
#define AARCH64_FBSD_TDEP_H
22+
2023
#include "regset.h"
2124

2225
/* The general-purpose regset consists of 30 X registers, plus LR, SP,
@@ -31,3 +34,5 @@
3134

3235
extern const struct regset aarch64_fbsd_gregset;
3336
extern const struct regset aarch64_fbsd_fpregset;
37+
38+
#endif /* AARCH64_FBSD_TDEP_H */

‎gdb/aarch64-linux-tdep.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
You should have received a copy of the GNU General Public License
1919
along with this program. If not, see <http://www.gnu.org/licenses/>. */
2020

21+
#ifndef AARCH64_LINUX_TDEP_H
22+
#define AARCH64_LINUX_TDEP_H
23+
2124
#include "regset.h"
2225

2326
/* The general-purpose regset consists of 31 X registers, plus SP, PC,
@@ -32,3 +35,5 @@
3235

3336
extern const struct regset aarch64_linux_gregset;
3437
extern const struct regset aarch64_linux_fpregset;
38+
39+
#endif /* AARCH64_LINUX_TDEP_H */

‎gdb/amd64-darwin-tdep.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@
1616
1717
You should have received a copy of the GNU General Public License
1818
along with this program. If not, see <http://www.gnu.org/licenses/>. */
19-
#ifndef __AMD64_DARWIN_TDEP_H__
20-
#define __AMD64_DARWIN_TDEP_H__
19+
20+
#ifndef AMD64_DARWIN_TDEP_H
21+
#define AMD64_DARWIN_TDEP_H
2122

2223
/* Mapping between the general-purpose registers in Darwin x86-64 thread
2324
state and GDB's register cache layout.
2425
Indexed by amd64_regnum. */
2526
extern int amd64_darwin_thread_state_reg_offset[];
2627
extern const int amd64_darwin_thread_state_num_regs;
2728

28-
#endif /* __AMD64_DARWIN_TDEP_H__ */
29+
#endif /* AMD64_DARWIN_TDEP_H */

‎gdb/annotate.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
You should have received a copy of the GNU General Public License
1717
along with this program. If not, see <http://www.gnu.org/licenses/>. */
1818

19+
#ifndef ANNOTATE_H
20+
#define ANNOTATE_H
21+
1922
#include "symtab.h"
2023
#include "gdbtypes.h"
2124

@@ -110,3 +113,5 @@ extern void annotate_array_section_end (void);
110113

111114
extern void (*deprecated_annotate_signalled_hook) (void);
112115
extern void (*deprecated_annotate_signal_hook) (void);
116+
117+
#endif /* ANNOTATE_H */

‎gdb/arch-utils.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
You should have received a copy of the GNU General Public License
1818
along with this program. If not, see <http://www.gnu.org/licenses/>. */
1919

20-
#ifndef GDBARCH_UTILS_H
21-
#define GDBARCH_UTILS_H
20+
#ifndef ARCH_UTILS_H
21+
#define ARCH_UTILS_H
2222

2323
struct gdbarch;
2424
struct frame_info;
@@ -271,4 +271,4 @@ extern bool default_in_indirect_branch_thunk (gdbarch *gdbarch,
271271
extern ULONGEST default_type_align (struct gdbarch *gdbarch,
272272
struct type *type);
273273

274-
#endif
274+
#endif /* ARCH_UTILS_H */

‎gdb/arch/aarch64-insn.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
You should have received a copy of the GNU General Public License
1717
along with this program. If not, see <http://www.gnu.org/licenses/>. */
1818

19-
#ifndef AARCH64_INSN_H
20-
#define AARCH64_INSN_H 1
19+
#ifndef ARCH_AARCH64_INSN_H
20+
#define ARCH_AARCH64_INSN_H
2121

2222
extern int aarch64_debug;
2323

@@ -321,4 +321,4 @@ int aarch64_emit_load_store (uint32_t *buf, uint32_t size,
321321
struct aarch64_register rn,
322322
struct aarch64_memory_operand operand);
323323

324-
#endif
324+
#endif /* ARCH_AARCH64_INSN_H */

‎gdb/arch/amd64.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,13 @@
1515
You should have received a copy of the GNU General Public License
1616
along with this program. If not, see <http://www.gnu.org/licenses/>. */
1717

18+
#ifndef ARCH_AMD64_H
19+
#define ARCH_AMD64_H
20+
1821
#include "common/tdesc.h"
1922
#include <stdint.h>
2023

2124
target_desc *amd64_create_target_description (uint64_t xcr0, bool is_x32,
2225
bool is_linux, bool segments);
26+
27+
#endif /* ARCH_AMD64_H */

‎gdb/arch/arm-get-next-pcs.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
You should have received a copy of the GNU General Public License
1818
along with this program. If not, see <http://www.gnu.org/licenses/>. */
1919

20-
#ifndef ARM_GET_NEXT_PCS_H
21-
#define ARM_GET_NEXT_PCS_H 1
20+
#ifndef ARCH_ARM_GET_NEXT_PCS_H
21+
#define ARCH_ARM_GET_NEXT_PCS_H
2222

2323
#include <vector>
2424

@@ -64,4 +64,4 @@ void arm_get_next_pcs_ctor (struct arm_get_next_pcs *self,
6464
/* Find the next possible PCs after the current instruction executes. */
6565
std::vector<CORE_ADDR> arm_get_next_pcs (struct arm_get_next_pcs *self);
6666

67-
#endif /* ARM_GET_NEXT_PCS_H */
67+
#endif /* ARCH_ARM_GET_NEXT_PCS_H */

0 commit comments

Comments
 (0)