This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] Normalize include guards in gdb
- From: Tom Tromey <tromey at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 7 Feb 2019 10:28:02 -0000
- Subject: [binutils-gdb] Normalize include guards in gdb
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1a5c25988eabb35e0e40ea484b1eea029d9b7f53
commit 1a5c25988eabb35e0e40ea484b1eea029d9b7f53
Author: Tom Tromey <tom@tromey.com>
Date: Sun Jan 27 12:51:36 2019 -0700
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 <tom@tromey.com>
* 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 <tom@tromey.com>
* 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.
Diff:
---
gdb/ChangeLog | 191 +++++++++++++++++++++++++++++++++
gdb/aarch32-linux-nat.h | 5 +
gdb/aarch64-fbsd-tdep.h | 5 +
gdb/aarch64-linux-tdep.h | 5 +
gdb/amd64-darwin-tdep.h | 7 +-
gdb/annotate.h | 5 +
gdb/arch-utils.h | 6 +-
gdb/arch/aarch64-insn.h | 6 +-
gdb/arch/amd64.h | 5 +
gdb/arch/arm-get-next-pcs.h | 6 +-
gdb/arch/arm-linux.h | 7 +-
gdb/arch/arm.h | 6 +-
gdb/arch/i386.h | 5 +
gdb/arch/tic6x.h | 5 +
gdb/arch/xtensa.h | 6 +-
gdb/arm-fbsd-tdep.h | 5 +
gdb/arm-linux-tdep.h | 4 +
gdb/ax.h | 6 +-
gdb/bfin-tdep.h | 5 +
gdb/buildsym-legacy.h | 6 +-
gdb/charset-list.h | 5 +
gdb/cli/cli-cmds.h | 6 +-
gdb/cli/cli-decode.h | 6 +-
gdb/cli/cli-interp.h | 6 +-
gdb/cli/cli-script.h | 6 +-
gdb/cli/cli-setshow.h | 6 +-
gdb/cli/cli-style.h | 6 +-
gdb/cli/cli-utils.h | 7 +-
gdb/common/break-common.h | 7 +-
gdb/common/btrace-common.h | 6 +-
gdb/common/buffer.h | 6 +-
gdb/common/cleanups.h | 6 +-
gdb/common/common-debug.h | 6 +-
gdb/common/common-defs.h | 6 +-
gdb/common/common-exceptions.h | 6 +-
gdb/common/common-gdbthread.h | 6 +-
gdb/common/common-inferior.h | 6 +-
gdb/common/common-regcache.h | 6 +-
gdb/common/common-types.h | 6 +-
gdb/common/common-utils.h | 6 +-
gdb/common/environ.h | 6 +-
gdb/common/fileio.h | 6 +-
gdb/common/filestuff.h | 6 +-
gdb/common/filtered-iterator.h | 6 +-
gdb/common/gdb_assert.h | 6 +-
gdb/common/gdb_locale.h | 6 +-
gdb/common/gdb_optional.h | 6 +-
gdb/common/gdb_ref_ptr.h | 6 +-
gdb/common/gdb_setjmp.h | 6 +-
gdb/common/gdb_splay_tree.h | 6 +-
gdb/common/gdb_string_view.h | 8 +-
gdb/common/gdb_sys_time.h | 6 +-
gdb/common/gdb_tilde_expand.h | 6 +-
gdb/common/gdb_unique_ptr.h | 6 +-
gdb/common/gdb_unlinker.h | 6 +-
gdb/common/gdb_vecs.h | 6 +-
gdb/common/gdb_wait.h | 6 +-
gdb/common/host-defs.h | 6 +-
gdb/common/job-control.h | 6 +-
gdb/common/netstuff.h | 6 +-
gdb/common/observable.h | 6 +-
gdb/common/pathstuff.h | 6 +-
gdb/common/preprocessor.h | 6 +-
gdb/common/print-utils.h | 6 +-
gdb/common/ptid.h | 6 +-
gdb/common/queue.h | 6 +-
gdb/common/refcounted-object.h | 6 +-
gdb/common/run-time-clock.h | 6 +-
gdb/common/safe-iterator.h | 6 +-
gdb/common/scoped_fd.h | 6 +-
gdb/common/scoped_mmap.h | 7 +-
gdb/common/scoped_restore.h | 6 +-
gdb/common/selftest.h | 6 +-
gdb/common/tdesc.h | 6 +-
gdb/common/vec.h | 6 +-
gdb/common/version.h | 6 +-
gdb/common/x86-xstate.h | 6 +-
gdb/common/xml-utils.h | 6 +-
gdb/compile/compile-c.h | 6 +-
gdb/compile/compile-cplus.h | 6 +-
gdb/compile/compile-internal.h | 6 +-
gdb/compile/compile-object-load.h | 6 +-
gdb/compile/compile-object-run.h | 6 +-
gdb/compile/compile.h | 6 +-
gdb/compile/gcc-c-plugin.h | 5 +
gdb/compile/gcc-cp-plugin.h | 5 +
gdb/config/djgpp/langinfo.h | 6 +-
gdb/config/djgpp/nl_types.h | 6 +-
gdb/config/i386/nm-i386gnu.h | 6 +-
gdb/config/nm-linux.h | 5 +
gdb/config/nm-nto.h | 6 +-
gdb/config/sparc/nm-sol2.h | 6 +-
gdb/cp-abi.h | 7 +-
gdb/darwin-nat.h | 6 +-
gdb/event-loop.h | 5 +
gdb/f-lang.h | 4 +
gdb/frv-tdep.h | 4 +
gdb/gdb-stabs.h | 7 +-
gdb/gdbserver/ChangeLog | 33 ++++++
gdb/gdbserver/ax.h | 6 +-
gdb/gdbserver/debug.h | 6 +-
gdb/gdbserver/dll.h | 6 +-
gdb/gdbserver/event-loop.h | 6 +-
gdb/gdbserver/gdb_proc_service.h | 6 +-
gdb/gdbserver/gdbthread.h | 6 +-
gdb/gdbserver/hostio.h | 6 +-
gdb/gdbserver/i387-fp.h | 6 +-
gdb/gdbserver/inferiors.h | 6 +-
gdb/gdbserver/linux-aarch32-low.h | 5 +
gdb/gdbserver/linux-aarch64-tdesc.h | 5 +
gdb/gdbserver/linux-low.h | 5 +
gdb/gdbserver/linux-ppc-tdesc-init.h | 5 +
gdb/gdbserver/linux-s390-tdesc.h | 5 +
gdb/gdbserver/linux-x86-tdesc.h | 5 +
gdb/gdbserver/lynx-low.h | 5 +
gdb/gdbserver/mem-break.h | 6 +-
gdb/gdbserver/notif.h | 5 +
gdb/gdbserver/nto-low.h | 7 +-
gdb/gdbserver/regcache.h | 6 +-
gdb/gdbserver/remote-utils.h | 6 +-
gdb/gdbserver/server.h | 6 +-
gdb/gdbserver/target.h | 6 +-
gdb/gdbserver/tdesc.h | 6 +-
gdb/gdbserver/tracepoint.h | 6 +-
gdb/gdbserver/utils.h | 6 +-
gdb/gdbserver/win32-low.h | 5 +
gdb/gdbserver/wincecompat.h | 6 +-
gdb/gdbserver/x86-low.h | 4 +
gdb/gdbserver/x86-tdesc.h | 6 +-
gdb/gnu-nat.h | 6 +-
gdb/guile/guile-internal.h | 7 +-
gdb/guile/guile.h | 6 +-
gdb/hppa-linux-offsets.h | 5 +
gdb/i386-darwin-tdep.h | 7 +-
gdb/linux-fork.h | 5 +
gdb/linux-nat.h | 5 +
gdb/linux-record.h | 7 +-
gdb/location.h | 7 +-
gdb/m2-lang.h | 4 +
gdb/mi/mi-cmd-break.h | 7 +-
gdb/mi/mi-cmds.h | 6 +-
gdb/mi/mi-common.h | 6 +-
gdb/mi/mi-console.h | 6 +-
gdb/mi/mi-getopt.h | 8 +-
gdb/mi/mi-interp.h | 6 +-
gdb/mi/mi-main.h | 7 +-
gdb/mi/mi-out.h | 6 +-
gdb/mi/mi-parse.h | 6 +-
gdb/mips-linux-tdep.h | 5 +
gdb/mn10300-tdep.h | 5 +
gdb/nat/aarch64-linux-hw-point.h | 6 +-
gdb/nat/aarch64-linux.h | 6 +-
gdb/nat/aarch64-sve-linux-ptrace.h | 6 +-
gdb/nat/aarch64-sve-linux-sigcontext.h | 7 +-
gdb/nat/amd64-linux-siginfo.h | 6 +-
gdb/nat/fork-inferior.h | 6 +-
gdb/nat/gdb_ptrace.h | 8 +-
gdb/nat/gdb_thread_db.h | 6 +-
gdb/nat/glibc_thread_db.h | 6 +-
gdb/nat/linux-btrace.h | 6 +-
gdb/nat/linux-namespaces.h | 6 +-
gdb/nat/linux-nat.h | 6 +-
gdb/nat/linux-osdata.h | 6 +-
gdb/nat/linux-procfs.h | 6 +-
gdb/nat/linux-ptrace.h | 6 +-
gdb/nat/linux-waitpid.h | 6 +-
gdb/nat/mips-linux-watch.h | 7 +-
gdb/nat/ppc-linux.h | 6 +-
gdb/nat/x86-cpuid.h | 6 +-
gdb/nat/x86-dregs.h | 7 +-
gdb/nat/x86-gcc-cpuid.h | 6 ++
gdb/nat/x86-linux-dregs.h | 6 +-
gdb/nat/x86-linux.h | 6 +-
gdb/nto-tdep.h | 6 +-
gdb/observable.h | 6 +-
gdb/or1k-tdep.h | 7 +-
gdb/p-lang.h | 5 +
gdb/proc-utils.h | 5 +
gdb/procfs.h | 4 +
gdb/python/py-event.h | 6 +-
gdb/python/py-events.h | 6 +-
gdb/python/py-instruction.h | 6 +-
gdb/python/py-record-btrace.h | 6 +-
gdb/python/py-record-full.h | 6 +-
gdb/python/py-record.h | 6 +-
gdb/python/py-ref.h | 6 +-
gdb/python/py-stopevent.h | 6 +-
gdb/python/python-internal.h | 6 +-
gdb/python/python.h | 6 +-
gdb/record.h | 6 +-
gdb/regformats/regdef.h | 6 +-
gdb/riscv-fbsd-tdep.h | 5 +
gdb/rs6000-tdep.h | 4 +
gdb/stabsread.h | 5 +
gdb/target-float.h | 6 +-
gdb/target/resume.h | 6 +-
gdb/target/target.h | 6 +-
gdb/target/wait.h | 6 +-
gdb/target/waitstatus.h | 6 +-
gdb/tic6x-tdep.h | 5 +
gdb/tui/tui-command.h | 6 +-
gdb/tui/tui-data.h | 6 +-
gdb/tui/tui-disasm.h | 6 +-
gdb/tui/tui-file.h | 6 +-
gdb/tui/tui-hooks.h | 6 +-
gdb/tui/tui-io.h | 6 +-
gdb/tui/tui-layout.h | 6 +-
gdb/tui/tui-out.h | 6 +-
gdb/tui/tui-regs.h | 6 +-
gdb/tui/tui-source.h | 6 +-
gdb/tui/tui-stack.h | 6 +-
gdb/tui/tui-win.h | 6 +-
gdb/tui/tui-windata.h | 6 +-
gdb/tui/tui-wingeneral.h | 6 +-
gdb/tui/tui-winsource.h | 6 +-
gdb/tui/tui.h | 6 +-
gdb/varobj-iter.h | 5 +
gdb/xcoffread.h | 6 +-
gdb/xtensa-tdep.h | 3 +
gdb/yy-remap.h | 5 +
220 files changed, 974 insertions(+), 530 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c5c08ec..c17d05a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,194 @@
+2019-02-07 Tom Tromey <tom@tromey.com>
+
+ * 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.
+
2019-02-06 Philippe Waroquiers <philippe.waroquiers@skynet.be>
* macrotab.c (macro_define_internal): New function that
diff --git a/gdb/aarch32-linux-nat.h b/gdb/aarch32-linux-nat.h
index 29d7964..093211c 100644
--- a/gdb/aarch32-linux-nat.h
+++ b/gdb/aarch32-linux-nat.h
@@ -15,6 +15,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef AARCH32_LINUX_NAT_H
+#define AARCH32_LINUX_NAT_H
+
/* Fetch and store VFP Registers. The kernel object has space for 32
64-bit registers, and the FPSCR. This is even when on a VFPv2 or
VFPv3D16 target. */
@@ -32,3 +35,5 @@ void aarch32_vfp_regcache_supply (struct regcache *regcache, gdb_byte *regs,
void aarch32_vfp_regcache_collect (const struct regcache *regcache,
gdb_byte *regs,
const int vfp_register_count);
+
+#endif /* AARCH32_LINUX_NAT_H */
diff --git a/gdb/aarch64-fbsd-tdep.h b/gdb/aarch64-fbsd-tdep.h
index 37c0cfc..ebe671a 100644
--- a/gdb/aarch64-fbsd-tdep.h
+++ b/gdb/aarch64-fbsd-tdep.h
@@ -17,6 +17,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef AARCH64_FBSD_TDEP_H
+#define AARCH64_FBSD_TDEP_H
+
#include "regset.h"
/* The general-purpose regset consists of 30 X registers, plus LR, SP,
@@ -31,3 +34,5 @@
extern const struct regset aarch64_fbsd_gregset;
extern const struct regset aarch64_fbsd_fpregset;
+
+#endif /* AARCH64_FBSD_TDEP_H */
diff --git a/gdb/aarch64-linux-tdep.h b/gdb/aarch64-linux-tdep.h
index f8d6104..814222e 100644
--- a/gdb/aarch64-linux-tdep.h
+++ b/gdb/aarch64-linux-tdep.h
@@ -18,6 +18,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef AARCH64_LINUX_TDEP_H
+#define AARCH64_LINUX_TDEP_H
+
#include "regset.h"
/* The general-purpose regset consists of 31 X registers, plus SP, PC,
@@ -32,3 +35,5 @@
extern const struct regset aarch64_linux_gregset;
extern const struct regset aarch64_linux_fpregset;
+
+#endif /* AARCH64_LINUX_TDEP_H */
diff --git a/gdb/amd64-darwin-tdep.h b/gdb/amd64-darwin-tdep.h
index d9848e9..90dc26f 100644
--- a/gdb/amd64-darwin-tdep.h
+++ b/gdb/amd64-darwin-tdep.h
@@ -16,8 +16,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef __AMD64_DARWIN_TDEP_H__
-#define __AMD64_DARWIN_TDEP_H__
+
+#ifndef AMD64_DARWIN_TDEP_H
+#define AMD64_DARWIN_TDEP_H
/* Mapping between the general-purpose registers in Darwin x86-64 thread
state and GDB's register cache layout.
@@ -25,4 +26,4 @@
extern int amd64_darwin_thread_state_reg_offset[];
extern const int amd64_darwin_thread_state_num_regs;
-#endif /* __AMD64_DARWIN_TDEP_H__ */
+#endif /* AMD64_DARWIN_TDEP_H */
diff --git a/gdb/annotate.h b/gdb/annotate.h
index 03e7447..4a9e1b5 100644
--- a/gdb/annotate.h
+++ b/gdb/annotate.h
@@ -16,6 +16,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef ANNOTATE_H
+#define ANNOTATE_H
+
#include "symtab.h"
#include "gdbtypes.h"
@@ -110,3 +113,5 @@ extern void annotate_array_section_end (void);
extern void (*deprecated_annotate_signalled_hook) (void);
extern void (*deprecated_annotate_signal_hook) (void);
+
+#endif /* ANNOTATE_H */
diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h
index 7db358f..155cf5c 100644
--- a/gdb/arch-utils.h
+++ b/gdb/arch-utils.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDBARCH_UTILS_H
-#define GDBARCH_UTILS_H
+#ifndef ARCH_UTILS_H
+#define ARCH_UTILS_H
struct gdbarch;
struct frame_info;
@@ -271,4 +271,4 @@ extern bool default_in_indirect_branch_thunk (gdbarch *gdbarch,
extern ULONGEST default_type_align (struct gdbarch *gdbarch,
struct type *type);
-#endif
+#endif /* ARCH_UTILS_H */
diff --git a/gdb/arch/aarch64-insn.h b/gdb/arch/aarch64-insn.h
index 43120cc..4492594 100644
--- a/gdb/arch/aarch64-insn.h
+++ b/gdb/arch/aarch64-insn.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef AARCH64_INSN_H
-#define AARCH64_INSN_H 1
+#ifndef ARCH_AARCH64_INSN_H
+#define ARCH_AARCH64_INSN_H
extern int aarch64_debug;
@@ -321,4 +321,4 @@ int aarch64_emit_load_store (uint32_t *buf, uint32_t size,
struct aarch64_register rn,
struct aarch64_memory_operand operand);
-#endif
+#endif /* ARCH_AARCH64_INSN_H */
diff --git a/gdb/arch/amd64.h b/gdb/arch/amd64.h
index 9431e08..1e02c52 100644
--- a/gdb/arch/amd64.h
+++ b/gdb/arch/amd64.h
@@ -15,8 +15,13 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef ARCH_AMD64_H
+#define ARCH_AMD64_H
+
#include "common/tdesc.h"
#include <stdint.h>
target_desc *amd64_create_target_description (uint64_t xcr0, bool is_x32,
bool is_linux, bool segments);
+
+#endif /* ARCH_AMD64_H */
diff --git a/gdb/arch/arm-get-next-pcs.h b/gdb/arch/arm-get-next-pcs.h
index 59f0316..7c5ad5e 100644
--- a/gdb/arch/arm-get-next-pcs.h
+++ b/gdb/arch/arm-get-next-pcs.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef ARM_GET_NEXT_PCS_H
-#define ARM_GET_NEXT_PCS_H 1
+#ifndef ARCH_ARM_GET_NEXT_PCS_H
+#define ARCH_ARM_GET_NEXT_PCS_H
#include <vector>
@@ -64,4 +64,4 @@ void arm_get_next_pcs_ctor (struct arm_get_next_pcs *self,
/* Find the next possible PCs after the current instruction executes. */
std::vector<CORE_ADDR> arm_get_next_pcs (struct arm_get_next_pcs *self);
-#endif /* ARM_GET_NEXT_PCS_H */
+#endif /* ARCH_ARM_GET_NEXT_PCS_H */
diff --git a/gdb/arch/arm-linux.h b/gdb/arch/arm-linux.h
index d5ee140..04d3f23 100644
--- a/gdb/arch/arm-linux.h
+++ b/gdb/arch/arm-linux.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef ARM_LINUX_H
-#define ARM_LINUX_H
+#ifndef ARCH_ARM_LINUX_H
+#define ARCH_ARM_LINUX_H
/* The index to access CSPR in user_regs defined in GLIBC. */
#define ARM_CPSR_GREGNUM 16
@@ -78,4 +78,5 @@ struct arm_get_next_pcs;
CORE_ADDR arm_linux_get_next_pcs_fixup (struct arm_get_next_pcs *self,
CORE_ADDR pc);
-#endif /* ARM_LINUX_H */
+
+#endif /* ARCH_ARM_LINUX_H */
diff --git a/gdb/arch/arm.h b/gdb/arch/arm.h
index 21d45c5..c178542 100644
--- a/gdb/arch/arm.h
+++ b/gdb/arch/arm.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef ARM_H
-#define ARM_H
+#ifndef ARCH_ARM_H
+#define ARCH_ARM_H
/* Register numbers of various important registers. */
@@ -146,4 +146,4 @@ unsigned long shifted_reg_val (struct regcache *regcache,
unsigned long pc_val,
unsigned long status_reg);
-#endif
+#endif /* ARCH_ARM_H */
diff --git a/gdb/arch/i386.h b/gdb/arch/i386.h
index a6a801b..fa85438 100644
--- a/gdb/arch/i386.h
+++ b/gdb/arch/i386.h
@@ -15,7 +15,12 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef ARCH_I386_H
+#define ARCH_I386_H
+
#include "common/tdesc.h"
#include <stdint.h>
target_desc *i386_create_target_description (uint64_t xcr0, bool is_linux);
+
+#endif /* ARCH_I386_H */
diff --git a/gdb/arch/tic6x.h b/gdb/arch/tic6x.h
index e1c819d..36dadb3 100644
--- a/gdb/arch/tic6x.h
+++ b/gdb/arch/tic6x.h
@@ -15,6 +15,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef ARCH_TIC6X_H
+#define ARCH_TIC6X_H
+
enum c6x_feature
{
C6X_CORE,
@@ -24,3 +27,5 @@ enum c6x_feature
};
target_desc *tic6x_create_target_description (enum c6x_feature feature);
+
+#endif /* ARCH_TIC6X_H */
diff --git a/gdb/arch/xtensa.h b/gdb/arch/xtensa.h
index 044d0c9..9a6fa33 100644
--- a/gdb/arch/xtensa.h
+++ b/gdb/arch/xtensa.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef XTENSA_H
-#define XTENSA_H
+#ifndef ARCH_XTENSA_H
+#define ARCH_XTENSA_H
/* Xtensa ELF core file register set representation ('.reg' section).
Copied from target-side ELF header <xtensa/elf.h>. */
@@ -45,4 +45,4 @@ typedef struct
#define C0_NREGS 16 /* Number of A-registers to track in call0 ABI. */
-#endif
+#endif /* ARCH_XTENSA_H */
diff --git a/gdb/arm-fbsd-tdep.h b/gdb/arm-fbsd-tdep.h
index 986118e..754d683 100644
--- a/gdb/arm-fbsd-tdep.h
+++ b/gdb/arm-fbsd-tdep.h
@@ -17,6 +17,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef ARM_FBSD_TDEP_H
+#define ARM_FBSD_TDEP_H
+
#include "regset.h"
/* The general-purpose regset consists of 13 R registers, plus SP, LR,
@@ -38,3 +41,5 @@ extern const struct regset arm_fbsd_vfpregset;
extern const struct target_desc *
arm_fbsd_read_description_auxv (struct target_ops *target);
+
+#endif /* ARM_FBSD_TDEP_H */
diff --git a/gdb/arm-linux-tdep.h b/gdb/arm-linux-tdep.h
index 405996b..8f43048 100644
--- a/gdb/arm-linux-tdep.h
+++ b/gdb/arm-linux-tdep.h
@@ -17,6 +17,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef ARM_LINUX_TDEP_H
+#define ARM_LINUX_TDEP_H
+
struct regset;
struct regcache;
@@ -64,3 +67,4 @@ void arm_linux_collect_nwfpe (const struct regset *regset,
#define HWCAP_VFPv3 8192
#define HWCAP_VFPv3D16 16384
+#endif /* ARM_LINUX_TDEP_H */
diff --git a/gdb/ax.h b/gdb/ax.h
index e203a4b..d16098b 100644
--- a/gdb/ax.h
+++ b/gdb/ax.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef AGENTEXPR_H
-#define AGENTEXPR_H
+#ifndef AX_H
+#define AX_H
#include "common/vec.h"
@@ -267,4 +267,4 @@ extern struct aop_map aop_map[];
extern void ax_reqs (struct agent_expr *ax);
-#endif /* AGENTEXPR_H */
+#endif /* AX_H */
diff --git a/gdb/bfin-tdep.h b/gdb/bfin-tdep.h
index ece0d06..99eb4b4 100644
--- a/gdb/bfin-tdep.h
+++ b/gdb/bfin-tdep.h
@@ -19,6 +19,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef BFIN_TDEP_H
+#define BFIN_TDEP_H
+
enum gdb_regnum {
/* Core Registers */
BFIN_R0_REGNUM = 0,
@@ -99,3 +102,5 @@ struct gdbarch_tdep
/* Return the Blackfin ABI associated with GDBARCH. */
extern enum bfin_abi bfin_abi (struct gdbarch *gdbarch);
+
+#endif /* BFIN_TDEP_H */
diff --git a/gdb/buildsym-legacy.h b/gdb/buildsym-legacy.h
index 2c1bfff..55b41a4 100644
--- a/gdb/buildsym-legacy.h
+++ b/gdb/buildsym-legacy.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#if !defined (LEGACY_BUILDSYM_H)
-#define LEGACY_BUILDSYM_H 1
+#ifndef BUILDSYM_LEGACY_H
+#define BUILDSYM_LEGACY_H
#include "buildsym.h"
@@ -179,4 +179,4 @@ extern struct pending **get_global_symbols ();
extern struct buildsym_compunit *get_buildsym_compunit ();
-#endif /* defined (LEGACY_BUILDSYM_H) */
+#endif /* BUILDSYM_LEGACY_H */
diff --git a/gdb/charset-list.h b/gdb/charset-list.h
index 37c4bbc..8ec1f1b 100644
--- a/gdb/charset-list.h
+++ b/gdb/charset-list.h
@@ -17,6 +17,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef CHARSET_LIST_H
+#define CHARSET_LIST_H
+
/* Note that the first entry must always be "auto".
The remaining entries were created by running this script:
@@ -1188,3 +1191,5 @@
"WINSAMI2", \
"WS2", \
"YU",
+
+#endif /* CHARSET_LIST_H */
diff --git a/gdb/cli/cli-cmds.h b/gdb/cli/cli-cmds.h
index cc29929..63b8c40 100644
--- a/gdb/cli/cli-cmds.h
+++ b/gdb/cli/cli-cmds.h
@@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#if !defined (CLI_CMDS_H)
-#define CLI_CMDS_H 1
+#ifndef CLI_CLI_CMDS_H
+#define CLI_CLI_CMDS_H
#include "common/filestuff.h"
#include "common/gdb_optional.h"
@@ -142,4 +142,4 @@ extern gdb::optional<open_script>
extern int source_verbose;
extern int trace_commands;
-#endif /* !defined (CLI_CMDS_H) */
+#endif /* CLI_CLI_CMDS_H */
diff --git a/gdb/cli/cli-decode.h b/gdb/cli/cli-decode.h
index 39329f0..c53683d 100644
--- a/gdb/cli/cli-decode.h
+++ b/gdb/cli/cli-decode.h
@@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#if !defined (CLI_DECODE_H)
-#define CLI_DECODE_H 1
+#ifndef CLI_CLI_DECODE_H
+#define CLI_CLI_DECODE_H
/* This file defines the private interfaces for any code implementing
command internals. */
@@ -270,4 +270,4 @@ extern int cli_user_command_p (struct cmd_list_element *);
extern int find_command_name_length (const char *);
-#endif /* !defined (CLI_DECODE_H) */
+#endif /* CLI_CLI_DECODE_H */
diff --git a/gdb/cli/cli-interp.h b/gdb/cli/cli-interp.h
index b87432d..77d73a2 100644
--- a/gdb/cli/cli-interp.h
+++ b/gdb/cli/cli-interp.h
@@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef CLI_INTERP_H
-#define CLI_INTERP_H 1
+#ifndef CLI_CLI_INTERP_H
+#define CLI_CLI_INTERP_H
#include "interps.h"
@@ -60,4 +60,4 @@ extern void cli_interpreter_pre_command_loop (struct interp *self);
extern int should_print_stop_to_console (struct interp *interp,
struct thread_info *tp);
-#endif
+#endif /* CLI_CLI_INTERP_H */
diff --git a/gdb/cli/cli-script.h b/gdb/cli/cli-script.h
index 246c5ae..e76e794 100644
--- a/gdb/cli/cli-script.h
+++ b/gdb/cli/cli-script.h
@@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#if !defined (CLI_SCRIPT_H)
-#define CLI_SCRIPT_H 1
+#ifndef CLI_CLI_SCRIPT_H
+#define CLI_CLI_SCRIPT_H
struct ui_file;
struct cmd_list_element;
@@ -168,4 +168,4 @@ extern void print_command_trace (const char *cmd, ...)
extern void reset_command_nest_depth (void);
-#endif /* !defined (CLI_SCRIPT_H) */
+#endif /* CLI_CLI_SCRIPT_H */
diff --git a/gdb/cli/cli-setshow.h b/gdb/cli/cli-setshow.h
index 078d47a..e4d13c3 100644
--- a/gdb/cli/cli-setshow.h
+++ b/gdb/cli/cli-setshow.h
@@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#if !defined (CLI_SETSHOW_H)
-#define CLI_SETSHOW_H 1
+#ifndef CLI_CLI_SETSHOW_H
+#define CLI_CLI_SETSHOW_H
struct cmd_list_element;
@@ -31,4 +31,4 @@ extern void do_show_command (const char *arg, int from_tty,
extern void cmd_show_list (struct cmd_list_element *list, int from_tty,
const char *prefix);
-#endif /* !defined (CLI_SETSHOW_H) */
+#endif /* CLI_CLI_SETSHOW_H */
diff --git a/gdb/cli/cli-style.h b/gdb/cli/cli-style.h
index 07830f9..287bad7 100644
--- a/gdb/cli/cli-style.h
+++ b/gdb/cli/cli-style.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef CLI_STYLE_H
-#define CLI_STYLE_H
+#ifndef CLI_CLI_STYLE_H
+#define CLI_CLI_STYLE_H
#include "ui-file.h"
@@ -96,4 +96,4 @@ extern cli_style_option address_style;
/* True if styling is enabled. */
extern int cli_styling;
-#endif /* CLI_STYLE_H */
+#endif /* CLI_CLI_STYLE_H */
diff --git a/gdb/cli/cli-utils.h b/gdb/cli/cli-utils.h
index 1ab879d..d0161db 100644
--- a/gdb/cli/cli-utils.h
+++ b/gdb/cli/cli-utils.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef CLI_UTILS_H
-#define CLI_UTILS_H
+#ifndef CLI_CLI_UTILS_H
+#define CLI_CLI_UTILS_H
/* *PP is a string denoting a number. Get the number. Advance *PP
after the string and any trailing whitespace.
@@ -238,4 +238,5 @@ struct qcs_flags
extern bool parse_flags_qcs (const char *which_command, const char **str,
qcs_flags *flags);
-#endif /* CLI_UTILS_H */
+
+#endif /* CLI_CLI_UTILS_H */
diff --git a/gdb/common/break-common.h b/gdb/common/break-common.h
index 4375fe3..d85cadf 100644
--- a/gdb/common/break-common.h
+++ b/gdb/common/break-common.h
@@ -16,8 +16,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef BREAK_COMMON_H
-#define BREAK_COMMON_H 1
+
+#ifndef COMMON_BREAK_COMMON_H
+#define COMMON_BREAK_COMMON_H
enum target_hw_bp_type
{
@@ -27,4 +28,4 @@ enum target_hw_bp_type
hw_execute = 3 /* Execute HW breakpoint */
};
-#endif
+#endif /* COMMON_BREAK_COMMON_H */
diff --git a/gdb/common/btrace-common.h b/gdb/common/btrace-common.h
index 284adf6..0b18924 100644
--- a/gdb/common/btrace-common.h
+++ b/gdb/common/btrace-common.h
@@ -19,8 +19,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef BTRACE_COMMON_H
-#define BTRACE_COMMON_H
+#ifndef COMMON_BTRACE_COMMON_H
+#define COMMON_BTRACE_COMMON_H
/* Branch tracing (btrace) is a per-thread control-flow execution trace of the
inferior. For presentation purposes, the branch trace is represented as a
@@ -254,4 +254,4 @@ extern const char *btrace_format_short_string (enum btrace_format format);
extern int btrace_data_append (struct btrace_data *dst,
const struct btrace_data *src);
-#endif /* BTRACE_COMMON_H */
+#endif /* COMMON_BTRACE_COMMON_H */
diff --git a/gdb/common/buffer.h b/gdb/common/buffer.h
index 66b770a..8b24b54 100644
--- a/gdb/common/buffer.h
+++ b/gdb/common/buffer.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef BUFFER_H
-#define BUFFER_H
+#ifndef COMMON_BUFFER_H
+#define COMMON_BUFFER_H
struct buffer
{
@@ -65,4 +65,4 @@ void buffer_xml_printf (struct buffer *buffer, const char *format, ...)
#define buffer_grow_str0(BUFFER,STRING) \
buffer_grow (BUFFER, STRING, strlen (STRING) + 1)
-#endif
+#endif /* COMMON_BUFFER_H */
diff --git a/gdb/common/cleanups.h b/gdb/common/cleanups.h
index 4d5c9fa..f49bcb4 100644
--- a/gdb/common/cleanups.h
+++ b/gdb/common/cleanups.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef CLEANUPS_H
-#define CLEANUPS_H
+#ifndef COMMON_CLEANUPS_H
+#define COMMON_CLEANUPS_H
/* Outside of cleanups.c, this is an opaque type. */
struct cleanup;
@@ -66,4 +66,4 @@ extern void restore_final_cleanups (struct cleanup *);
to pass to do_cleanups. */
extern void null_cleanup (void *);
-#endif /* CLEANUPS_H */
+#endif /* COMMON_CLEANUPS_H */
diff --git a/gdb/common/common-debug.h b/gdb/common/common-debug.h
index 5cf8230..d5bfc9e 100644
--- a/gdb/common/common-debug.h
+++ b/gdb/common/common-debug.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef COMMON_DEBUG_H
-#define COMMON_DEBUG_H
+#ifndef COMMON_COMMON_DEBUG_H
+#define COMMON_COMMON_DEBUG_H
/* Set to nonzero to enable debugging of hardware breakpoint/
watchpoint support code. */
@@ -38,4 +38,4 @@ extern void debug_printf (const char *format, ...)
extern void debug_vprintf (const char *format, va_list ap)
ATTRIBUTE_PRINTF (1, 0);
-#endif /* COMMON_DEBUG_H */
+#endif /* COMMON_COMMON_DEBUG_H */
diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index e574de5..732693d 100644
--- a/gdb/common/common-defs.h
+++ b/gdb/common/common-defs.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef COMMON_DEFS_H
-#define COMMON_DEFS_H
+#ifndef COMMON_COMMON_DEFS_H
+#define COMMON_COMMON_DEFS_H
#include "config.h"
@@ -127,4 +127,4 @@ extern char *current_directory;
#define HAVE_USEFUL_SBRK 1
#endif
-#endif /* COMMON_DEFS_H */
+#endif /* COMMON_COMMON_DEFS_H */
diff --git a/gdb/common/common-exceptions.h b/gdb/common/common-exceptions.h
index 0f03dc2..471e7c5 100644
--- a/gdb/common/common-exceptions.h
+++ b/gdb/common/common-exceptions.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef COMMON_EXCEPTIONS_H
-#define COMMON_EXCEPTIONS_H
+#ifndef COMMON_COMMON_EXCEPTIONS_H
+#define COMMON_COMMON_EXCEPTIONS_H
#include <setjmp.h>
#include <new>
@@ -338,4 +338,4 @@ extern void throw_quit (const char *fmt, ...)
/* A pre-defined non-exception. */
extern const struct gdb_exception exception_none;
-#endif /* COMMON_EXCEPTIONS_H */
+#endif /* COMMON_COMMON_EXCEPTIONS_H */
diff --git a/gdb/common/common-gdbthread.h b/gdb/common/common-gdbthread.h
index b7e93be..d692be2 100644
--- a/gdb/common/common-gdbthread.h
+++ b/gdb/common/common-gdbthread.h
@@ -16,10 +16,10 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef COMMON_GDBTHREAD_H
-#define COMMON_GDBTHREAD_H
+#ifndef COMMON_COMMON_GDBTHREAD_H
+#define COMMON_COMMON_GDBTHREAD_H
/* Switch from one thread to another. */
extern void switch_to_thread (ptid_t ptid);
-#endif /* ! COMMON_GDBTHREAD_H */
+#endif /* COMMON_COMMON_GDBTHREAD_H */
diff --git a/gdb/common/common-inferior.h b/gdb/common/common-inferior.h
index 7e8e736..72e4bd9 100644
--- a/gdb/common/common-inferior.h
+++ b/gdb/common/common-inferior.h
@@ -18,8 +18,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef COMMON_INFERIOR_H
-#define COMMON_INFERIOR_H
+#ifndef COMMON_COMMON_INFERIOR_H
+#define COMMON_COMMON_INFERIOR_H
/* Return the exec wrapper to be used when starting the inferior, or NULL
otherwise. */
@@ -38,4 +38,4 @@ extern const char *get_inferior_cwd ();
the directory. */
extern void set_inferior_cwd (const char *cwd);
-#endif /* ! COMMON_INFERIOR_H */
+#endif /* COMMON_COMMON_INFERIOR_H */
diff --git a/gdb/common/common-regcache.h b/gdb/common/common-regcache.h
index 938bb29..95ce64a 100644
--- a/gdb/common/common-regcache.h
+++ b/gdb/common/common-regcache.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef COMMON_REGCACHE_H
-#define COMMON_REGCACHE_H
+#ifndef COMMON_COMMON_REGCACHE_H
+#define COMMON_COMMON_REGCACHE_H
/* This header is a stopgap until we have an independent regcache. */
@@ -82,4 +82,4 @@ struct reg_buffer_common
virtual bool raw_compare (int regnum, const void *buf, int offset) const = 0;
};
-#endif /* COMMON_REGCACHE_H */
+#endif /* COMMON_COMMON_REGCACHE_H */
diff --git a/gdb/common/common-types.h b/gdb/common/common-types.h
index dcce0c3..ed73f6f 100644
--- a/gdb/common/common-types.h
+++ b/gdb/common/common-types.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef COMMON_TYPES_H
-#define COMMON_TYPES_H
+#ifndef COMMON_COMMON_TYPES_H
+#define COMMON_COMMON_TYPES_H
#ifdef GDBSERVER
@@ -63,4 +63,4 @@ typedef unsigned long long ULONGEST;
enum tribool { TRIBOOL_UNKNOWN = -1, TRIBOOL_FALSE = 0, TRIBOOL_TRUE = 1 };
-#endif /* COMMON_TYPES_H */
+#endif /* COMMON_COMMON_TYPES_H */
diff --git a/gdb/common/common-utils.h b/gdb/common/common-utils.h
index b2cb516..52bf343 100644
--- a/gdb/common/common-utils.h
+++ b/gdb/common/common-utils.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef COMMON_UTILS_H
-#define COMMON_UTILS_H
+#ifndef COMMON_COMMON_UTILS_H
+#define COMMON_COMMON_UTILS_H
#include <string>
#include <vector>
@@ -178,4 +178,4 @@ in_inclusive_range (T value, T low, T high)
extern ULONGEST align_up (ULONGEST v, int n);
extern ULONGEST align_down (ULONGEST v, int n);
-#endif
+#endif /* COMMON_COMMON_UTILS_H */
diff --git a/gdb/common/environ.h b/gdb/common/environ.h
index 29d534f..8a6b907 100644
--- a/gdb/common/environ.h
+++ b/gdb/common/environ.h
@@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#if !defined (ENVIRON_H)
-#define ENVIRON_H 1
+#ifndef COMMON_ENVIRON_H
+#define COMMON_ENVIRON_H
#include <vector>
#include <set>
@@ -100,4 +100,4 @@ private:
std::set<std::string> m_user_unset_env;
};
-#endif /* defined (ENVIRON_H) */
+#endif /* COMMON_ENVIRON_H */
diff --git a/gdb/common/fileio.h b/gdb/common/fileio.h
index 7559853..7a2e7c2 100644
--- a/gdb/common/fileio.h
+++ b/gdb/common/fileio.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef FILEIO_H
-#define FILEIO_H
+#ifndef COMMON_FILEIO_H
+#define COMMON_FILEIO_H
#include "gdb/fileio.h"
#include <sys/stat.h>
@@ -70,4 +70,4 @@ host_to_fileio_time (time_t num, fio_time_t fnum)
extern void host_to_fileio_stat (struct stat *st, struct fio_stat *fst);
-#endif /* FILEIO_H */
+#endif /* COMMON_FILEIO_H */
diff --git a/gdb/common/filestuff.h b/gdb/common/filestuff.h
index 1c50005..7e95b9c 100644
--- a/gdb/common/filestuff.h
+++ b/gdb/common/filestuff.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef FILESTUFF_H
-#define FILESTUFF_H
+#ifndef COMMON_FILESTUFF_H
+#define COMMON_FILESTUFF_H
#include <dirent.h>
#include <fcntl.h>
@@ -143,4 +143,4 @@ extern bool is_regular_file (const char *name, int *errno_ptr);
extern bool mkdir_recursive (const char *dir);
-#endif /* FILESTUFF_H */
+#endif /* COMMON_FILESTUFF_H */
diff --git a/gdb/common/filtered-iterator.h b/gdb/common/filtered-iterator.h
index 7d7aa3a..e1b486d 100644
--- a/gdb/common/filtered-iterator.h
+++ b/gdb/common/filtered-iterator.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef FILTERED_ITERATOR_H
-#define FILTERED_ITERATOR_H
+#ifndef COMMON_FILTERED_ITERATOR_H
+#define COMMON_FILTERED_ITERATOR_H
/* A filtered iterator. This wraps BaseIterator and automatically
skips elements that FilterFunc filters out. Requires that
@@ -84,4 +84,4 @@ private:
BaseIterator m_end {};
};
-#endif /* FILTERED_ITERATOR_H */
+#endif /* COMMON_FILTERED_ITERATOR_H */
diff --git a/gdb/common/gdb_assert.h b/gdb/common/gdb_assert.h
index f59f229..a719d87 100644
--- a/gdb/common/gdb_assert.h
+++ b/gdb/common/gdb_assert.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_ASSERT_H
-#define GDB_ASSERT_H
+#ifndef COMMON_GDB_ASSERT_H
+#define COMMON_GDB_ASSERT_H
/* A static assertion. This will cause a compile-time error if EXPR,
which must be a compile-time constant, is false. */
@@ -56,4 +56,4 @@
internal_error (__FILE__, __LINE__, _(message))
#endif
-#endif /* gdb_assert.h */
+#endif /* COMMON_GDB_ASSERT_H */
diff --git a/gdb/common/gdb_locale.h b/gdb/common/gdb_locale.h
index fb3d6c5..4e59b4f 100644
--- a/gdb/common/gdb_locale.h
+++ b/gdb/common/gdb_locale.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_LOCALE_H
-#define GDB_LOCALE_H
+#ifndef COMMON_GDB_LOCALE_H
+#define COMMON_GDB_LOCALE_H
#ifdef HAVE_LOCALE_H
# include <locale.h>
@@ -40,4 +40,4 @@
#include <langinfo.h>
#endif
-#endif /* GDB_LOCALE_H */
+#endif /* COMMON_GDB_LOCALE_H */
diff --git a/gdb/common/gdb_optional.h b/gdb/common/gdb_optional.h
index acb1045..7ca5725 100644
--- a/gdb/common/gdb_optional.h
+++ b/gdb/common/gdb_optional.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_OPTIONAL_H
-#define GDB_OPTIONAL_H
+#ifndef COMMON_GDB_OPTIONAL_H
+#define COMMON_GDB_OPTIONAL_H
#include "common/traits.h"
@@ -216,4 +216,4 @@ private:
}
-#endif /* GDB_OPTIONAL_H */
+#endif /* COMMON_GDB_OPTIONAL_H */
diff --git a/gdb/common/gdb_ref_ptr.h b/gdb/common/gdb_ref_ptr.h
index 65afe95..b104556 100644
--- a/gdb/common/gdb_ref_ptr.h
+++ b/gdb/common/gdb_ref_ptr.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_REF_PTR_H
-#define GDB_REF_PTR_H
+#ifndef COMMON_GDB_REF_PTR_H
+#define COMMON_GDB_REF_PTR_H
#include <cstddef>
@@ -225,4 +225,4 @@ inline bool operator!= (const std::nullptr_t, const ref_ptr<T, Policy> &rhs)
}
-#endif /* GDB_REF_PTR_H */
+#endif /* COMMON_GDB_REF_PTR_H */
diff --git a/gdb/common/gdb_setjmp.h b/gdb/common/gdb_setjmp.h
index 1597dad..d4ebbfa 100644
--- a/gdb/common/gdb_setjmp.h
+++ b/gdb/common/gdb_setjmp.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_SETJMP_H
-#define GDB_SETJMP_H
+#ifndef COMMON_GDB_SETJMP_H
+#define COMMON_GDB_SETJMP_H
#include <setjmp.h>
@@ -31,4 +31,4 @@
#define SIGLONGJMP(buf,val) longjmp((buf), (val))
#endif
-#endif /* GDB_SETJMP_H */
+#endif /* COMMON_GDB_SETJMP_H */
diff --git a/gdb/common/gdb_splay_tree.h b/gdb/common/gdb_splay_tree.h
index a3fc467..90b05cd 100644
--- a/gdb/common/gdb_splay_tree.h
+++ b/gdb/common/gdb_splay_tree.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_SPLAY_TREE_H
-#define GDB_SPLAY_TREE_H
+#ifndef COMMON_GDB_SPLAY_TREE_H
+#define COMMON_GDB_SPLAY_TREE_H
#include "splay-tree.h"
@@ -39,4 +39,4 @@ struct splay_tree_deleter
typedef std::unique_ptr<splay_tree_s, gdb::splay_tree_deleter>
gdb_splay_tree_up;
-#endif /* ! GDB_SPLAY_TREE_H */
+#endif /* COMMON_GDB_SPLAY_TREE_H */
diff --git a/gdb/common/gdb_string_view.h b/gdb/common/gdb_string_view.h
index 001f1af..68f7f7d 100644
--- a/gdb/common/gdb_string_view.h
+++ b/gdb/common/gdb_string_view.h
@@ -1,5 +1,9 @@
// Components for manipulating non-owning sequences of characters -*- C++ -*-
+
+#ifndef COMMON_GDB_STRING_VIEW_H
+#define COMMON_GDB_STRING_VIEW_H
+
// Note: This file has been stolen from the gcc repo
// (libstdc++-v3/include/experimental/string_view) and has local modifications.
@@ -29,8 +33,6 @@
// N3762 basic_string_view library
//
-#ifndef GDB_STRING_VIEW_H
-#define GDB_STRING_VIEW_H 1
#if __cplusplus >= 201703L
@@ -557,4 +559,4 @@ namespace gdb {
#endif // __cplusplus < 201703L
-#endif /* GDB_STRING_VIEW_H */
+#endif /* COMMON_GDB_STRING_VIEW_H */
diff --git a/gdb/common/gdb_sys_time.h b/gdb/common/gdb_sys_time.h
index 7b4ee57..66c2bb3 100644
--- a/gdb/common/gdb_sys_time.h
+++ b/gdb/common/gdb_sys_time.h
@@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_SYS_TIME_H
-#define GDB_SYS_TIME_H
+#ifndef COMMON_GDB_SYS_TIME_H
+#define COMMON_GDB_SYS_TIME_H
#include <sys/time.h>
@@ -35,4 +35,4 @@
# undef gettimeofday
#endif
-#endif /* #ifndef GDB_SYS_TIME_H */
+#endif /* COMMON_GDB_SYS_TIME_H */
diff --git a/gdb/common/gdb_tilde_expand.h b/gdb/common/gdb_tilde_expand.h
index 4f4c239..b181b6a 100644
--- a/gdb/common/gdb_tilde_expand.h
+++ b/gdb/common/gdb_tilde_expand.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_TILDE_EXPAND_H
-#define GDB_TILDE_EXPAND_H
+#ifndef COMMON_GDB_TILDE_EXPAND_H
+#define COMMON_GDB_TILDE_EXPAND_H
/* Perform path expansion (i.e., tilde expansion) on DIR, and return
the full path. */
@@ -28,4 +28,4 @@ extern std::string gdb_tilde_expand (const char *dir);
gdb::unique_xmalloc_ptr<char>. */
extern gdb::unique_xmalloc_ptr<char> gdb_tilde_expand_up (const char *dir);
-#endif /* ! GDB_TILDE_EXPAND_H */
+#endif /* COMMON_GDB_TILDE_EXPAND_H */
diff --git a/gdb/common/gdb_unique_ptr.h b/gdb/common/gdb_unique_ptr.h
index 1e8ceb4..327e127 100644
--- a/gdb/common/gdb_unique_ptr.h
+++ b/gdb/common/gdb_unique_ptr.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_UNIQUE_PTR_H
-#define GDB_UNIQUE_PTR_H 1
+#ifndef COMMON_GDB_UNIQUE_PTR_H
+#define COMMON_GDB_UNIQUE_PTR_H
#include <memory>
@@ -49,4 +49,4 @@ template<typename T> using unique_xmalloc_ptr
} /* namespace gdb */
-#endif /* GDB_UNIQUE_PTR_H */
+#endif /* COMMON_GDB_UNIQUE_PTR_H */
diff --git a/gdb/common/gdb_unlinker.h b/gdb/common/gdb_unlinker.h
index e3be44b..193c2f8 100644
--- a/gdb/common/gdb_unlinker.h
+++ b/gdb/common/gdb_unlinker.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_UNLINKER_H
-#define GDB_UNLINKER_H
+#ifndef COMMON_GDB_UNLINKER_H
+#define COMMON_GDB_UNLINKER_H
namespace gdb
{
@@ -57,4 +57,4 @@ class unlinker
}
-#endif /* GDB_UNLINKER_H */
+#endif /* COMMON_GDB_UNLINKER_H */
diff --git a/gdb/common/gdb_vecs.h b/gdb/common/gdb_vecs.h
index 86803d4..017bf93 100644
--- a/gdb/common/gdb_vecs.h
+++ b/gdb/common/gdb_vecs.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_VECS_H
-#define GDB_VECS_H
+#ifndef COMMON_GDB_VECS_H
+#define COMMON_GDB_VECS_H
#include "vec.h"
@@ -86,4 +86,4 @@ ordered_remove (std::vector<T> &vec, typename std::vector<T>::size_type ix)
return removed;
}
-#endif /* GDB_VECS_H */
+#endif /* COMMON_GDB_VECS_H */
diff --git a/gdb/common/gdb_wait.h b/gdb/common/gdb_wait.h
index b65dcd2..b3b752c 100644
--- a/gdb/common/gdb_wait.h
+++ b/gdb/common/gdb_wait.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_WAIT_H
-#define GDB_WAIT_H
+#ifndef COMMON_GDB_WAIT_H
+#define COMMON_GDB_WAIT_H
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h> /* POSIX */
@@ -110,4 +110,4 @@
#define __WCLONE 0x80000000 /* Wait for cloned process. */
#endif
-#endif
+#endif /* COMMON_GDB_WAIT_H */
diff --git a/gdb/common/host-defs.h b/gdb/common/host-defs.h
index e6878c9..dedd9b6 100644
--- a/gdb/common/host-defs.h
+++ b/gdb/common/host-defs.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef HOST_DEFS_H
-#define HOST_DEFS_H
+#ifndef COMMON_HOST_DEFS_H
+#define COMMON_HOST_DEFS_H
#include <limits.h>
@@ -58,4 +58,4 @@
#define SLASH_STRING "/"
#endif
-#endif /* HOST_DEFS_H */
+#endif /* COMMON_HOST_DEFS_H */
diff --git a/gdb/common/job-control.h b/gdb/common/job-control.h
index 1d9cae0..56eba97 100644
--- a/gdb/common/job-control.h
+++ b/gdb/common/job-control.h
@@ -18,8 +18,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef JOB_CONTROL_H
-#define JOB_CONTROL_H
+#ifndef COMMON_JOB_CONTROL_H
+#define COMMON_JOB_CONTROL_H
/* Do we have job control? Can be assumed to always be the same
within a given run of GDB. Use in gdb/inflow.c and
@@ -35,4 +35,4 @@ extern int gdb_setpgid ();
JOB_CONTROL. */
extern void have_job_control ();
-#endif /* ! JOB_CONTROL_H */
+#endif /* COMMON_JOB_CONTROL_H */
diff --git a/gdb/common/netstuff.h b/gdb/common/netstuff.h
index c0f8554..0d39fb5 100644
--- a/gdb/common/netstuff.h
+++ b/gdb/common/netstuff.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef NETSTUFF_H
-#define NETSTUFF_H
+#ifndef COMMON_NETSTUFF_H
+#define COMMON_NETSTUFF_H
#include <string>
@@ -73,4 +73,4 @@ extern parsed_connection_spec
extern parsed_connection_spec parse_connection_spec (const char *spec,
struct addrinfo *hint);
-#endif /* ! NETSTUFF_H */
+#endif /* COMMON_NETSTUFF_H */
diff --git a/gdb/common/observable.h b/gdb/common/observable.h
index 9110130..205c303 100644
--- a/gdb/common/observable.h
+++ b/gdb/common/observable.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#if !defined (GDB_COMMON_OBSERVABLE_H)
-#define GDB_COMMON_OBSERVABLE_H
+#ifndef COMMON_OBSERVABLE_H
+#define COMMON_OBSERVABLE_H
#include <algorithm>
#include <functional>
@@ -116,4 +116,4 @@ private:
} /* namespace gdb */
-#endif /* GDB_COMMON_OBSERVABLE_H */
+#endif /* COMMON_OBSERVABLE_H */
diff --git a/gdb/common/pathstuff.h b/gdb/common/pathstuff.h
index d43f337..c264e78 100644
--- a/gdb/common/pathstuff.h
+++ b/gdb/common/pathstuff.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef PATHSTUFF_H
-#define PATHSTUFF_H
+#ifndef COMMON_PATHSTUFF_H
+#define COMMON_PATHSTUFF_H
#include "common/byte-vector.h"
@@ -86,4 +86,4 @@ extern const char *get_shell ();
extern gdb::char_vector make_temp_filename (const std::string &f);
-#endif /* PATHSTUFF_H */
+#endif /* COMMON_PATHSTUFF_H */
diff --git a/gdb/common/preprocessor.h b/gdb/common/preprocessor.h
index a7c33d0..cb735c3 100644
--- a/gdb/common/preprocessor.h
+++ b/gdb/common/preprocessor.h
@@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef COMMON_PREPROC_H
-#define COMMON_PREPROC_H
+#ifndef COMMON_PREPROCESSOR_H
+#define COMMON_PREPROCESSOR_H
/* Generally useful preprocessor bits. */
@@ -32,4 +32,4 @@
includes commas to another macro. */
#define ESC_PARENS(...) __VA_ARGS__
-#endif /* COMMON_PREPROC */
+#endif /* COMMON_PREPROCESSOR_H */
diff --git a/gdb/common/print-utils.h b/gdb/common/print-utils.h
index 152bc59..815b14c 100644
--- a/gdb/common/print-utils.h
+++ b/gdb/common/print-utils.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef COMMON_CELLS_H
-#define COMMON_CELLS_H
+#ifndef COMMON_PRINT_UTILS_H
+#define COMMON_PRINT_UTILS_H
/* How many characters (including the terminating null byte) fit in a
cell. */
@@ -79,4 +79,4 @@ extern const char *host_address_to_string_1 (const void *addr);
extern char *get_print_cell (void);
-#endif /* COMMON_CELLS_H */
+#endif /* COMMON_PRINT_UTILS_H */
diff --git a/gdb/common/ptid.h b/gdb/common/ptid.h
index 16d1b64..31440c8 100644
--- a/gdb/common/ptid.h
+++ b/gdb/common/ptid.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef PTID_H
-#define PTID_H
+#ifndef COMMON_PTID_H
+#define COMMON_PTID_H
/* The ptid struct is a collection of the various "ids" necessary for
identifying the inferior process/thread being debugged. This
@@ -152,4 +152,4 @@ extern ptid_t null_ptid;
extern ptid_t minus_one_ptid;
-#endif
+#endif /* COMMON_PTID_H */
diff --git a/gdb/common/queue.h b/gdb/common/queue.h
index ed95ce7..3bc9c7e 100644
--- a/gdb/common/queue.h
+++ b/gdb/common/queue.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef QUEUE_H
-#define QUEUE_H
+#ifndef COMMON_QUEUE_H
+#define COMMON_QUEUE_H
/* These macros implement functions and structs for a general queue.
Macro 'DEFINE_QUEUE_P(TYPEDEF)' is to define the new queue type for
@@ -295,4 +295,4 @@ extern void \
queue_ ## TYPE ## _remove_elem (QUEUE (TYPE) *q, \
QUEUE_ITER (TYPE) *iter); \
-#endif /* QUEUE_H */
+#endif /* COMMON_QUEUE_H */
diff --git a/gdb/common/refcounted-object.h b/gdb/common/refcounted-object.h
index 629d728..4bf7fcf 100644
--- a/gdb/common/refcounted-object.h
+++ b/gdb/common/refcounted-object.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef REFCOUNTED_OBJECT_H
-#define REFCOUNTED_OBJECT_H
+#ifndef COMMON_REFCOUNTED_OBJECT_H
+#define COMMON_REFCOUNTED_OBJECT_H
/* Base class of intrusively reference-countable objects.
Incrementing and decrementing the reference count is an external
@@ -67,4 +67,4 @@ struct refcounted_object_ref_policy
}
};
-#endif /* REFCOUNTED_OBJECT_H */
+#endif /* COMMON_REFCOUNTED_OBJECT_H */
diff --git a/gdb/common/run-time-clock.h b/gdb/common/run-time-clock.h
index 2522ca3..9c15dd7 100644
--- a/gdb/common/run-time-clock.h
+++ b/gdb/common/run-time-clock.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef RUN_TIME_CLOCK_H
-#define RUN_TIME_CLOCK_H
+#ifndef COMMON_RUN_TIME_CLOCK_H
+#define COMMON_RUN_TIME_CLOCK_H
#include <chrono>
@@ -72,4 +72,4 @@ struct run_time_clock
system_cpu_time_clock::time_point &system) noexcept;
};
-#endif
+#endif /* COMMON_RUN_TIME_CLOCK_H */
diff --git a/gdb/common/safe-iterator.h b/gdb/common/safe-iterator.h
index 18027c6..89aec01 100644
--- a/gdb/common/safe-iterator.h
+++ b/gdb/common/safe-iterator.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef SAFE_ITERATOR_H
-#define SAFE_ITERATOR_H
+#ifndef COMMON_SAFE_ITERATOR_H
+#define COMMON_SAFE_ITERATOR_H
/* A forward iterator that wraps Iterator, such that when iterating
with iterator IT, it is possible to delete *IT without invalidating
@@ -90,4 +90,4 @@ private:
Iterator m_end {};
};
-#endif /* SAFE_ITERATOR_H */
+#endif /* COMMON_SAFE_ITERATOR_H */
diff --git a/gdb/common/scoped_fd.h b/gdb/common/scoped_fd.h
index 87b1f42..bdd22f5 100644
--- a/gdb/common/scoped_fd.h
+++ b/gdb/common/scoped_fd.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef SCOPED_FD_H
-#define SCOPED_FD_H
+#ifndef COMMON_SCOPED_FD_H
+#define COMMON_SCOPED_FD_H
#include <unistd.h>
#include "filestuff.h"
@@ -84,4 +84,4 @@ private:
int m_fd;
};
-#endif /* SCOPED_FD_H */
+#endif /* COMMON_SCOPED_FD_H */
diff --git a/gdb/common/scoped_mmap.h b/gdb/common/scoped_mmap.h
index 1c9d102..763f40e 100644
--- a/gdb/common/scoped_mmap.h
+++ b/gdb/common/scoped_mmap.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef SCOPED_MMAP_H
-#define SCOPED_MMAP_H
+#ifndef COMMON_SCOPED_MMAP_H
+#define COMMON_SCOPED_MMAP_H
#include "config.h"
@@ -92,4 +92,5 @@ private:
scoped_mmap mmap_file (const char *filename);
#endif /* HAVE_SYS_MMAN_H */
-#endif /* SCOPED_MMAP_H */
+
+#endif /* COMMON_SCOPED_MMAP_H */
diff --git a/gdb/common/scoped_restore.h b/gdb/common/scoped_restore.h
index 127752e..54c3ff5 100644
--- a/gdb/common/scoped_restore.h
+++ b/gdb/common/scoped_restore.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef SCOPED_RESTORE_H
-#define SCOPED_RESTORE_H
+#ifndef COMMON_SCOPED_RESTORE_H
+#define COMMON_SCOPED_RESTORE_H
/* Base class for scoped_restore_tmpl. */
class scoped_restore_base
@@ -115,4 +115,4 @@ scoped_restore_tmpl<T> make_scoped_restore (T *var, T2 value)
return scoped_restore_tmpl<T> (var, value);
}
-#endif /* SCOPED_RESTORE_H */
+#endif /* COMMON_SCOPED_RESTORE_H */
diff --git a/gdb/common/selftest.h b/gdb/common/selftest.h
index 0922bca..c566ec5 100644
--- a/gdb/common/selftest.h
+++ b/gdb/common/selftest.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef SELFTEST_H
-#define SELFTEST_H
+#ifndef COMMON_SELFTEST_H
+#define COMMON_SELFTEST_H
/* A test is just a function that does some checks and throws an
exception if something has gone wrong. */
@@ -70,4 +70,4 @@ extern void for_each_selftest (for_each_selftest_ftype func);
error (_("self-test failed at %s:%d"), __FILE__, __LINE__); \
} while (0)
-#endif /* SELFTEST_H */
+#endif /* COMMON_SELFTEST_H */
diff --git a/gdb/common/tdesc.h b/gdb/common/tdesc.h
index 4db5473..a0bc633 100644
--- a/gdb/common/tdesc.h
+++ b/gdb/common/tdesc.h
@@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef ARCH_TDESC_H
-#define ARCH_TDESC_H 1
+#ifndef COMMON_TDESC_H
+#define COMMON_TDESC_H
struct tdesc_feature;
struct tdesc_type;
@@ -404,4 +404,4 @@ private:
std::string *m_buffer;
};
-#endif /* ARCH_TDESC_H */
+#endif /* COMMON_TDESC_H */
diff --git a/gdb/common/vec.h b/gdb/common/vec.h
index d4e4c02..8ac146d 100644
--- a/gdb/common/vec.h
+++ b/gdb/common/vec.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#if !defined (GDB_VEC_H)
-#define GDB_VEC_H
+#ifndef COMMON_VEC_H
+#define COMMON_VEC_H
#include "diagnostics.h"
@@ -1147,4 +1147,4 @@ static inline T *VEC_OP (T,safe_insert) \
return VEC_OP (T,quick_insert) (*vec_, ix_, obj_ VEC_ASSERT_PASS); \
}
-#endif /* GDB_VEC_H */
+#endif /* COMMON_VEC_H */
diff --git a/gdb/common/version.h b/gdb/common/version.h
index c804f47..9e840e7 100644
--- a/gdb/common/version.h
+++ b/gdb/common/version.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef VERSION_H
-#define VERSION_H
+#ifndef COMMON_VERSION_H
+#define COMMON_VERSION_H
/* Version number of GDB, as a string. */
extern const char version[];
@@ -28,4 +28,4 @@ extern const char host_name[];
/* Canonical target name as a string. */
extern const char target_name[];
-#endif /* #ifndef VERSION_H */
+#endif /* COMMON_VERSION_H */
diff --git a/gdb/common/x86-xstate.h b/gdb/common/x86-xstate.h
index 7f378bd..4ce8f61 100644
--- a/gdb/common/x86-xstate.h
+++ b/gdb/common/x86-xstate.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef X86_XSTATE_H
-#define X86_XSTATE_H 1
+#ifndef COMMON_X86_XSTATE_H
+#define COMMON_X86_XSTATE_H
/* The extended state feature bits. */
#define X86_XSTATE_X87 (1ULL << 0)
@@ -85,4 +85,4 @@
#define I387_MXCSR_INIT_VAL 0x1f80
-#endif /* X86_XSTATE_H */
+#endif /* COMMON_X86_XSTATE_H */
diff --git a/gdb/common/xml-utils.h b/gdb/common/xml-utils.h
index 4cc47d9..747e8c8 100644
--- a/gdb/common/xml-utils.h
+++ b/gdb/common/xml-utils.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef XML_UTILS_H
-#define XML_UTILS_H
+#ifndef COMMON_XML_UTILS_H
+#define COMMON_XML_UTILS_H
/* Return a string with special characters from TEXT replaced by entity
references. */
@@ -30,4 +30,4 @@ extern std::string xml_escape_text (const char *text);
extern void xml_escape_text_append (std::string *result, const char *text);
-#endif
+#endif /* COMMON_XML_UTILS_H */
diff --git a/gdb/compile/compile-c.h b/gdb/compile/compile-c.h
index ecb69df..b5a2194 100644
--- a/gdb/compile/compile-c.h
+++ b/gdb/compile/compile-c.h
@@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_COMPILE_C_H
-#define GDB_COMPILE_C_H
+#ifndef COMPILE_COMPILE_C_H
+#define COMPILE_COMPILE_C_H
#include "common/enum-flags.h"
#include "gcc-c-plugin.h"
@@ -92,4 +92,4 @@ extern std::string c_get_range_decl_name (const struct dynamic_prop *prop);
extern gdb::unique_xmalloc_ptr<char>
c_symbol_substitution_name (struct symbol *sym);
-#endif /* GDB_COMPILE_C_H */
+#endif /* COMPILE_COMPILE_C_H */
diff --git a/gdb/compile/compile-cplus.h b/gdb/compile/compile-cplus.h
index 8979942..e5ea7d7 100644
--- a/gdb/compile/compile-cplus.h
+++ b/gdb/compile/compile-cplus.h
@@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_COMPILE_CPLUS_H
-#define GDB_COMPILE_CPLUS_H
+#ifndef COMPILE_COMPILE_CPLUS_H
+#define COMPILE_COMPILE_CPLUS_H
#include "common/enum-flags.h"
#include "gcc-cp-plugin.h"
@@ -202,4 +202,4 @@ private:
enum gcc_cp_symbol_kind get_method_access_flag (const struct type *type,
int fni, int num);
-#endif /* GDB_COMPILE_CPLUS_H */
+#endif /* COMPILE_COMPILE_CPLUS_H */
diff --git a/gdb/compile/compile-internal.h b/gdb/compile/compile-internal.h
index 90e8292..406a369 100644
--- a/gdb/compile/compile-internal.h
+++ b/gdb/compile/compile-internal.h
@@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_COMPILE_INTERNAL_H
-#define GDB_COMPILE_INTERNAL_H
+#ifndef COMPILE_COMPILE_INTERNAL_H
+#define COMPILE_COMPILE_INTERNAL_H
#include "gcc-c-interface.h"
@@ -207,4 +207,4 @@ private:
std::string m_object_file;
};
-#endif /* GDB_COMPILE_INTERNAL_H */
+#endif /* COMPILE_COMPILE_INTERNAL_H */
diff --git a/gdb/compile/compile-object-load.h b/gdb/compile/compile-object-load.h
index 33cc292..730164f 100644
--- a/gdb/compile/compile-object-load.h
+++ b/gdb/compile/compile-object-load.h
@@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_COMPILE_OBJECT_LOAD_H
-#define GDB_COMPILE_OBJECT_LOAD_H
+#ifndef COMPILE_COMPILE_OBJECT_LOAD_H
+#define COMPILE_COMPILE_OBJECT_LOAD_H
#include "compile-internal.h"
#include <list>
@@ -82,4 +82,4 @@ extern struct compile_module *compile_object_load
enum compile_i_scope_types scope, void *scope_data);
extern void munmap_list_free (struct munmap_list *head);
-#endif /* GDB_COMPILE_OBJECT_LOAD_H */
+#endif /* COMPILE_COMPILE_OBJECT_LOAD_H */
diff --git a/gdb/compile/compile-object-run.h b/gdb/compile/compile-object-run.h
index 0124095..f8c1ef4 100644
--- a/gdb/compile/compile-object-run.h
+++ b/gdb/compile/compile-object-run.h
@@ -14,11 +14,11 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_COMPILE_OBJECT_RUN_H
-#define GDB_COMPILE_OBJECT_RUN_H
+#ifndef COMPILE_COMPILE_OBJECT_RUN_H
+#define COMPILE_COMPILE_OBJECT_RUN_H
#include "compile-object-load.h"
extern void compile_object_run (struct compile_module *module);
-#endif /* GDB_COMPILE_OBJECT_RUN_H */
+#endif /* COMPILE_COMPILE_OBJECT_RUN_H */
diff --git a/gdb/compile/compile.h b/gdb/compile/compile.h
index 88bd8d8..127d867 100644
--- a/gdb/compile/compile.h
+++ b/gdb/compile/compile.h
@@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_COMPILE_H
-#define GDB_COMPILE_H
+#ifndef COMPILE_COMPILE_H
+#define COMPILE_COMPILE_H
struct ui_file;
struct gdbarch;
@@ -106,4 +106,4 @@ extern void compile_print_value (struct value *val, void *data_voidp);
/* Command element for the 'compile' command. */
extern cmd_list_element *compile_cmd_element;
-#endif /* GDB_COMPILE_H */
+#endif /* COMPILE_COMPILE_H */
diff --git a/gdb/compile/gcc-c-plugin.h b/gdb/compile/gcc-c-plugin.h
index 9ec78e2..12869f3 100644
--- a/gdb/compile/gcc-c-plugin.h
+++ b/gdb/compile/gcc-c-plugin.h
@@ -17,6 +17,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef COMPILE_GCC_C_PLUGIN_H
+#define COMPILE_GCC_C_PLUGIN_H
+
#include "compile-internal.h"
/* A class representing the C plug-in. */
@@ -64,3 +67,5 @@ private:
/* The GCC C context. */
struct gcc_c_context *m_context;
};
+
+#endif /* COMPILE_GCC_C_PLUGIN_H */
diff --git a/gdb/compile/gcc-cp-plugin.h b/gdb/compile/gcc-cp-plugin.h
index f7ba494..0f0d01f 100644
--- a/gdb/compile/gcc-cp-plugin.h
+++ b/gdb/compile/gcc-cp-plugin.h
@@ -17,6 +17,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef COMPILE_GCC_CP_PLUGIN_H
+#define COMPILE_GCC_CP_PLUGIN_H
+
/* A class representing the GCC C++ plug-in. */
#include "gcc-cp-interface.h"
@@ -83,3 +86,5 @@ private:
/* The GCC C++ context. */
struct gcc_cp_context *m_context;
};
+
+#endif /* COMPILE_GCC_CP_PLUGIN_H */
diff --git a/gdb/config/djgpp/langinfo.h b/gdb/config/djgpp/langinfo.h
index 2c4a900..6a69202 100644
--- a/gdb/config/djgpp/langinfo.h
+++ b/gdb/config/djgpp/langinfo.h
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef _LANGINFO_H
-#define _LANGINFO_H
+#ifndef CONFIG_DJGPP_LANGINFO_H
+#define CONFIG_DJGPP_LANGINFO_H
#include <nl_types.h>
@@ -32,4 +32,4 @@ enum {
extern char *nl_langinfo (nl_item);
-#endif /* _LANGINFO_H */
+#endif /* CONFIG_DJGPP_LANGINFO_H */
diff --git a/gdb/config/djgpp/nl_types.h b/gdb/config/djgpp/nl_types.h
index fc9445f..f0020b5 100644
--- a/gdb/config/djgpp/nl_types.h
+++ b/gdb/config/djgpp/nl_types.h
@@ -17,9 +17,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef _NL_TYPES_H
-#define _NL_TYPES_H
+#ifndef CONFIG_DJGPP_NL_TYPES_H
+#define CONFIG_DJGPP_NL_TYPES_H
typedef int nl_item;
-#endif /* _NL_TYPES_H */
+#endif /* CONFIG_DJGPP_NL_TYPES_H */
diff --git a/gdb/config/i386/nm-i386gnu.h b/gdb/config/i386/nm-i386gnu.h
index 8c157c2..99f3fc7 100644
--- a/gdb/config/i386/nm-i386gnu.h
+++ b/gdb/config/i386/nm-i386gnu.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef NM_I386GNU_H
-#define NM_I386GNU_H
+#ifndef CONFIG_I386_NM_I386GNU_H
+#define CONFIG_I386_NM_I386GNU_H
#include <unistd.h>
#include <mach.h>
@@ -34,4 +34,4 @@ extern char *gnu_target_pid_to_str (int pid);
#define THREAD_STATE_CLEAR_TRACED(state) \
((((struct i386_thread_state *) (state))->efl &= ~0x100), 1)
-#endif /* nm-i386gnu.h */
+#endif /* CONFIG_I386_NM_I386GNU_H */
diff --git a/gdb/config/nm-linux.h b/gdb/config/nm-linux.h
index bc3e360..76502ff 100644
--- a/gdb/config/nm-linux.h
+++ b/gdb/config/nm-linux.h
@@ -17,8 +17,13 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef CONFIG_NM_LINUX_H
+#define CONFIG_NM_LINUX_H
+
/* Use elf_gregset_t and elf_fpregset_t, rather than
gregset_t and fpregset_t. */
#define GDB_GREGSET_T elf_gregset_t
#define GDB_FPREGSET_T elf_fpregset_t
+
+#endif /* CONFIG_NM_LINUX_H */
diff --git a/gdb/config/nm-nto.h b/gdb/config/nm-nto.h
index 6ee6886..2d43ffa 100644
--- a/gdb/config/nm-nto.h
+++ b/gdb/config/nm-nto.h
@@ -19,11 +19,11 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef NM_NTO_H
-#define NM_NTO_H
+#ifndef CONFIG_NM_NTO_H
+#define CONFIG_NM_NTO_H
/* Setup the valid realtime signal range. */
#define REALTIME_LO 41
#define REALTIME_HI 56
-#endif /* NM_NTO_H */
+#endif /* CONFIG_NM_NTO_H */
diff --git a/gdb/config/sparc/nm-sol2.h b/gdb/config/sparc/nm-sol2.h
index fdae224..02cd9d0 100644
--- a/gdb/config/sparc/nm-sol2.h
+++ b/gdb/config/sparc/nm-sol2.h
@@ -17,10 +17,10 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef NM_SOL2_H
-#define NM_SOL2_H
+#ifndef CONFIG_SPARC_NM_SOL2_H
+#define CONFIG_SPARC_NM_SOL2_H
#define GDB_GREGSET_T prgregset_t
#define GDB_FPREGSET_T prfpregset_t
-#endif /* nm-sol2.h */
+#endif /* CONFIG_SPARC_NM_SOL2_H */
diff --git a/gdb/cp-abi.h b/gdb/cp-abi.h
index fa17770..3cbf19c 100644
--- a/gdb/cp-abi.h
+++ b/gdb/cp-abi.h
@@ -20,8 +20,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef CP_ABI_H_
-#define CP_ABI_H_ 1
+#ifndef CP_ABI_H
+#define CP_ABI_H
struct fn_field;
struct type;
@@ -253,5 +253,4 @@ struct cp_abi_ops
extern int register_cp_abi (struct cp_abi_ops *abi);
extern void set_cp_abi_as_auto_default (const char *short_name);
-#endif
-
+#endif /* CP_ABI_H */
diff --git a/gdb/darwin-nat.h b/gdb/darwin-nat.h
index e4d8a5d..f33e253 100644
--- a/gdb/darwin-nat.h
+++ b/gdb/darwin-nat.h
@@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef __DARWIN_NAT_H__
-#define __DARWIN_NAT_H__
+#ifndef DARWIN_NAT_H
+#define DARWIN_NAT_H
#include "inf-child.h"
#include <mach/mach.h>
@@ -201,4 +201,4 @@ void darwin_set_sstep (thread_t thread, int enable);
void darwin_check_osabi (darwin_inferior *inf, thread_t thread);
-#endif /* __DARWIN_NAT_H__ */
+#endif /* DARWIN_NAT_H */
diff --git a/gdb/event-loop.h b/gdb/event-loop.h
index c4f5946..99b7766 100644
--- a/gdb/event-loop.h
+++ b/gdb/event-loop.h
@@ -17,6 +17,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef EVENT_LOOP_H
+#define EVENT_LOOP_H
+
/* An event loop listens for events from multiple event sources. When
an event arrives, it is queued and processed by calling the
appropriate event handler. The event loop then continues to listen
@@ -127,3 +130,5 @@ extern void mark_async_event_handler (struct async_event_handler *handler);
extern void clear_async_event_handler (struct async_event_handler *handler);
extern void initialize_async_signal_handlers (void);
+
+#endif /* EVENT_LOOP_H */
diff --git a/gdb/f-lang.h b/gdb/f-lang.h
index cab06f9..a4ae6a7 100644
--- a/gdb/f-lang.h
+++ b/gdb/f-lang.h
@@ -20,6 +20,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef F_LANG_H
+#define F_LANG_H
+
struct type_print_options;
struct parser_state;
@@ -79,3 +82,4 @@ struct builtin_f_type
/* Return the Fortran type table for the specified architecture. */
extern const struct builtin_f_type *builtin_f_type (struct gdbarch *gdbarch);
+#endif /* F_LANG_H */
diff --git a/gdb/frv-tdep.h b/gdb/frv-tdep.h
index 551ca6b..6b5cc7f 100644
--- a/gdb/frv-tdep.h
+++ b/gdb/frv-tdep.h
@@ -16,6 +16,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef FRV_TDEP_H
+#define FRV_TDEP_H
+
/* Enumerate the possible ABIs for FR-V. */
enum frv_abi
{
@@ -118,3 +121,4 @@ CORE_ADDR frv_fetch_objfile_link_map (struct objfile *objfile);
struct target_so_ops;
extern struct target_so_ops frv_so_ops;
+#endif /* FRV_TDEP_H */
diff --git a/gdb/gdb-stabs.h b/gdb/gdb-stabs.h
index 6ee073d..3b64d32 100644
--- a/gdb/gdb-stabs.h
+++ b/gdb/gdb-stabs.h
@@ -17,14 +17,15 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef GDB_STABS_H
+#define GDB_STABS_H
+
/* This file exists to hold the common definitions required of most of
the symbol-readers that end up using stabs. The common use of
these `symbol-type-specific' customizations of the generic data
structures makes the stabs-oriented symbol readers able to call
each others' functions as required. */
-#if !defined (GDBSTABS_H)
-#define GDBSTABS_H
/* The tag used to find the DBX info attached to an objfile. This is
global because it is referenced by several modules. */
@@ -73,4 +74,4 @@ struct dbx_symfile_info
#define DBX_BSS_SECTION(o) (DBX_SYMFILE_INFO(o)->bss_section)
#define DBX_STAB_SECTION(o) (DBX_SYMFILE_INFO(o)->stab_section)
-#endif /* GDBSTABS_H */
+#endif /* GDB_STABS_H */
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index be9a263..17593cb 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,36 @@
+2019-02-07 Tom Tromey <tom@tromey.com>
+
+ * 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.
+
2018-01-30 Szabolcs Nagy <szabolcs.nagy@arm.com>
PR gdb/23985
diff --git a/gdb/gdbserver/ax.h b/gdb/gdbserver/ax.h
index fd96834..3e9fd8f 100644
--- a/gdb/gdbserver/ax.h
+++ b/gdb/gdbserver/ax.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#if !defined (AX_H)
-#define AX_H 1
+#ifndef GDBSERVER_AX_H
+#define GDBSERVER_AX_H
#include "regcache.h"
@@ -142,4 +142,4 @@ struct emit_ops
extern CORE_ADDR current_insn_ptr;
extern int emit_error;
-#endif /* AX_H */
+#endif /* GDBSERVER_AX_H */
diff --git a/gdb/gdbserver/debug.h b/gdb/gdbserver/debug.h
index 041945a..e40f28c 100644
--- a/gdb/gdbserver/debug.h
+++ b/gdb/gdbserver/debug.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef DEBUG_H
-#define DEBUG_H
+#ifndef GDBSERVER_DEBUG_H
+#define GDBSERVER_DEBUG_H
/* We declare debug format variables here, and debug_threads but no other
debug content variables (e.g., not remote_debug) because while this file
@@ -51,4 +51,4 @@ void do_debug_exit (const char *function_name);
do { } while (0)
#endif
-#endif /* DEBUG_H */
+#endif /* GDBSERVER_DEBUG_H */
diff --git a/gdb/gdbserver/dll.h b/gdb/gdbserver/dll.h
index 4dad56b..fd45d73 100644
--- a/gdb/gdbserver/dll.h
+++ b/gdb/gdbserver/dll.h
@@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef DLL_H
-#define DLL_H
+#ifndef GDBSERVER_DLL_H
+#define GDBSERVER_DLL_H
#include <list>
@@ -37,4 +37,4 @@ extern void clear_dlls (void);
extern void loaded_dll (const char *name, CORE_ADDR base_addr);
extern void unloaded_dll (const char *name, CORE_ADDR base_addr);
-#endif /* DLL_H */
+#endif /* GDBSERVER_DLL_H */
diff --git a/gdb/gdbserver/event-loop.h b/gdb/gdbserver/event-loop.h
index 39135a4..a09a6ad 100644
--- a/gdb/gdbserver/event-loop.h
+++ b/gdb/gdbserver/event-loop.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef EVENT_LOOP_H
-#define EVENT_LOOP_H
+#ifndef GDBSERVER_EVENT_LOOP_H
+#define GDBSERVER_EVENT_LOOP_H
typedef void *gdb_client_data;
typedef int (handler_func) (int, gdb_client_data);
@@ -33,4 +33,4 @@ extern void delete_callback_event (int id);
extern void start_event_loop (void);
extern void initialize_event_loop (void);
-#endif /* EVENT_LOOP_H */
+#endif /* GDBSERVER_EVENT_LOOP_H */
diff --git a/gdb/gdbserver/gdb_proc_service.h b/gdb/gdbserver/gdb_proc_service.h
index 03e6a06..626bc16 100644
--- a/gdb/gdbserver/gdb_proc_service.h
+++ b/gdb/gdbserver/gdb_proc_service.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_PROC_SERVICE_H
-#define GDB_PROC_SERVICE_H
+#ifndef GDBSERVER_GDB_PROC_SERVICE_H
+#define GDBSERVER_GDB_PROC_SERVICE_H
#include "common/gdb_proc_service.h"
@@ -28,4 +28,4 @@ struct ps_prochandle
current inferior. */
};
-#endif /* gdb_proc_service.h */
+#endif /* GDBSERVER_GDB_PROC_SERVICE_H */
diff --git a/gdb/gdbserver/gdbthread.h b/gdb/gdbserver/gdbthread.h
index fcd0202..44ed3c4 100644
--- a/gdb/gdbserver/gdbthread.h
+++ b/gdb/gdbserver/gdbthread.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef GDB_THREAD_H
-#define GDB_THREAD_H
+#ifndef GDBSERVER_GDBTHREAD_H
+#define GDBSERVER_GDBTHREAD_H
#include "common/common-gdbthread.h"
#include "inferiors.h"
@@ -224,4 +224,4 @@ lwpid_of (const thread_info *thread)
return thread->id.lwp ();
}
-#endif /* GDB_THREAD_H */
+#endif /* GDBSERVER_GDBTHREAD_H */
diff --git a/gdb/gdbserver/hostio.h b/gdb/gdbserver/hostio.h
index acddef2..17a2bea 100644
--- a/gdb/gdbserver/hostio.h
+++ b/gdb/gdbserver/hostio.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef HOSTIO_H
-#define HOSTIO_H
+#ifndef GDBSERVER_HOSTIO_H
+#define GDBSERVER_HOSTIO_H
/* Per-connection setup. */
extern void hostio_handle_new_gdb_connection (void);
@@ -28,4 +28,4 @@ extern int handle_vFile (char *, int, int *);
/* Functions from hostio-errno.c. */
extern void hostio_last_error_from_errno (char *own_buf);
-#endif /* HOSTIO_H */
+#endif /* GDBSERVER_HOSTIO_H */
diff --git a/gdb/gdbserver/i387-fp.h b/gdb/gdbserver/i387-fp.h
index f331992..e5eaedf 100644
--- a/gdb/gdbserver/i387-fp.h
+++ b/gdb/gdbserver/i387-fp.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef I387_FP_H
-#define I387_FP_H
+#ifndef GDBSERVER_I387_FP_H
+#define GDBSERVER_I387_FP_H
void i387_cache_to_fsave (struct regcache *regcache, void *buf);
void i387_fsave_to_cache (struct regcache *regcache, const void *buf);
@@ -30,4 +30,4 @@ void i387_xsave_to_cache (struct regcache *regcache, const void *buf);
extern unsigned long long x86_xcr0;
-#endif /* I387_FP_H */
+#endif /* GDBSERVER_I387_FP_H */
diff --git a/gdb/gdbserver/inferiors.h b/gdb/gdbserver/inferiors.h
index b2a1866..cf284b8 100644
--- a/gdb/gdbserver/inferiors.h
+++ b/gdb/gdbserver/inferiors.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef INFERIORS_H
-#define INFERIORS_H
+#ifndef GDBSERVER_INFERIORS_H
+#define GDBSERVER_INFERIORS_H
#include "common/gdb_vecs.h"
#include <list>
@@ -144,4 +144,4 @@ void *thread_target_data (struct thread_info *);
struct regcache *thread_regcache_data (struct thread_info *);
void set_thread_regcache_data (struct thread_info *, struct regcache *);
-#endif /* INFERIORS_H */
+#endif /* GDBSERVER_INFERIORS_H */
diff --git a/gdb/gdbserver/linux-aarch32-low.h b/gdb/gdbserver/linux-aarch32-low.h
index 64f6848..44e626c 100644
--- a/gdb/gdbserver/linux-aarch32-low.h
+++ b/gdb/gdbserver/linux-aarch32-low.h
@@ -15,6 +15,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef GDBSERVER_LINUX_AARCH32_LOW_H
+#define GDBSERVER_LINUX_AARCH32_LOW_H
+
extern struct regs_info regs_info_aarch32;
void arm_fill_gregset (struct regcache *regcache, void *buf);
@@ -34,3 +37,5 @@ void init_registers_arm_with_neon (void);
int arm_is_thumb_mode (void);
extern const struct target_desc *tdesc_arm_with_neon;
+
+#endif /* GDBSERVER_LINUX_AARCH32_LOW_H */
diff --git a/gdb/gdbserver/linux-aarch64-tdesc.h b/gdb/gdbserver/linux-aarch64-tdesc.h
index a23b6b6..7ce8150 100644
--- a/gdb/gdbserver/linux-aarch64-tdesc.h
+++ b/gdb/gdbserver/linux-aarch64-tdesc.h
@@ -17,8 +17,13 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef GDBSERVER_LINUX_AARCH64_TDESC_H
+#define GDBSERVER_LINUX_AARCH64_TDESC_H
+
const target_desc * aarch64_linux_read_description (uint64_t vq);
#if GDB_SELF_TEST
void initialize_low_tdesc ();
#endif
+
+#endif /* GDBSERVER_LINUX_AARCH64_TDESC_H */
diff --git a/gdb/gdbserver/linux-low.h b/gdb/gdbserver/linux-low.h
index b99236f..d09390d 100644
--- a/gdb/gdbserver/linux-low.h
+++ b/gdb/gdbserver/linux-low.h
@@ -16,6 +16,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef GDBSERVER_LINUX_LOW_H
+#define GDBSERVER_LINUX_LOW_H
+
#include "nat/linux-nat.h"
#include "nat/gdb_thread_db.h"
#include <signal.h>
@@ -430,3 +433,5 @@ void thread_db_notice_clone (struct thread_info *parent_thr, ptid_t child_ptid);
bool thread_db_thread_handle (ptid_t ptid, gdb_byte **handle, int *handle_len);
extern int have_ptrace_getregset;
+
+#endif /* GDBSERVER_LINUX_LOW_H */
diff --git a/gdb/gdbserver/linux-ppc-tdesc-init.h b/gdb/gdbserver/linux-ppc-tdesc-init.h
index 16f5b9c..4f9a7c5 100644
--- a/gdb/gdbserver/linux-ppc-tdesc-init.h
+++ b/gdb/gdbserver/linux-ppc-tdesc-init.h
@@ -17,6 +17,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef GDBSERVER_LINUX_PPC_TDESC_INIT_H
+#define GDBSERVER_LINUX_PPC_TDESC_INIT_H
+
/* Note: since IPA obviously knows what ABI it's running on (32 vs 64),
it's sufficient to pass only the register set here. This, together with
the ABI known at IPA compile time, maps to a tdesc. */
@@ -105,3 +108,5 @@ void init_registers_powerpc_isa207_vsx64l (void);
void init_registers_powerpc_isa207_htm_vsx64l (void);
#endif
+
+#endif /* GDBSERVER_LINUX_PPC_TDESC_INIT_H */
diff --git a/gdb/gdbserver/linux-s390-tdesc.h b/gdb/gdbserver/linux-s390-tdesc.h
index cf1021a..dc05fcd 100644
--- a/gdb/gdbserver/linux-s390-tdesc.h
+++ b/gdb/gdbserver/linux-s390-tdesc.h
@@ -17,6 +17,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef GDBSERVER_LINUX_S390_TDESC_H
+#define GDBSERVER_LINUX_S390_TDESC_H
+
/* Note: since IPA obviously knows what ABI it's running on (s390 vs s390x),
it's sufficient to pass only the register set here. This, together with
the ABI known at IPA compile time, maps to a tdesc. */
@@ -109,3 +112,5 @@ void init_registers_s390_gs_linux64 (void);
extern const struct target_desc *tdesc_s390_gs_linux64;
#endif
+
+#endif /* GDBSERVER_LINUX_S390_TDESC_H */
diff --git a/gdb/gdbserver/linux-x86-tdesc.h b/gdb/gdbserver/linux-x86-tdesc.h
index ac4199e..5f1fb18 100644
--- a/gdb/gdbserver/linux-x86-tdesc.h
+++ b/gdb/gdbserver/linux-x86-tdesc.h
@@ -18,6 +18,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef GDBSERVER_LINUX_X86_TDESC_H
+#define GDBSERVER_LINUX_X86_TDESC_H
+
/* Note: since IPA obviously knows what ABI it's running on (i386 vs x86_64
vs x32), it's sufficient to pass only the register set here. This,
together with the ABI known at IPA compile time, maps to a tdesc. */
@@ -51,3 +54,5 @@ const struct target_desc *amd64_linux_read_description (uint64_t xcr0,
const struct target_desc *i386_linux_read_description (uint64_t xcr0);
void initialize_low_tdesc ();
+
+#endif /* GDBSERVER_LINUX_X86_TDESC_H */
diff --git a/gdb/gdbserver/lynx-low.h b/gdb/gdbserver/lynx-low.h
index 8a84204..506d6cb 100644
--- a/gdb/gdbserver/lynx-low.h
+++ b/gdb/gdbserver/lynx-low.h
@@ -15,6 +15,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef GDBSERVER_LYNX_LOW_H
+#define GDBSERVER_LYNX_LOW_H
+
struct regcache;
struct target_desc;
@@ -52,3 +55,5 @@ extern struct lynx_target_ops the_low_target;
/* The inferior's target description. This is a global because the
LynxOS ports support neither bi-arch nor multi-process. */
extern const struct target_desc *lynx_tdesc;
+
+#endif /* GDBSERVER_LYNX_LOW_H */
diff --git a/gdb/gdbserver/mem-break.h b/gdb/gdbserver/mem-break.h
index 49cdfea..d2d7510 100644
--- a/gdb/gdbserver/mem-break.h
+++ b/gdb/gdbserver/mem-break.h
@@ -18,8 +18,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef MEM_BREAK_H
-#define MEM_BREAK_H
+#ifndef GDBSERVER_MEM_BREAK_H
+#define GDBSERVER_MEM_BREAK_H
#include "common/break-common.h"
@@ -276,4 +276,4 @@ int remove_memory_breakpoint (struct raw_breakpoint *bp);
void clone_all_breakpoints (struct thread_info *child_thread,
const struct thread_info *parent_thread);
-#endif /* MEM_BREAK_H */
+#endif /* GDBSERVER_MEM_BREAK_H */
diff --git a/gdb/gdbserver/notif.h b/gdb/gdbserver/notif.h
index add5536..7d07679 100644
--- a/gdb/gdbserver/notif.h
+++ b/gdb/gdbserver/notif.h
@@ -16,6 +16,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef GDBSERVER_NOTIF_H
+#define GDBSERVER_NOTIF_H
+
#include "target.h"
#include "common/queue.h"
@@ -62,3 +65,5 @@ void notif_event_enque (struct notif_server *notif,
struct notif_event *event);
void initialize_notif (void);
+
+#endif /* GDBSERVER_NOTIF_H */
diff --git a/gdb/gdbserver/nto-low.h b/gdb/gdbserver/nto-low.h
index 6114525..61981c6 100644
--- a/gdb/gdbserver/nto-low.h
+++ b/gdb/gdbserver/nto-low.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef NTO_LOW_H
-#define NTO_LOW_H
+#ifndef GDBSERVER_NTO_LOW_H
+#define GDBSERVER_NTO_LOW_H
struct target_desc;
@@ -46,5 +46,4 @@ extern struct nto_target_ops the_low_target;
LynxOS ports support neither bi-arch nor multi-process. */
extern const struct target_desc *nto_tdesc;
-#endif
-
+#endif /* GDBSERVER_NTO_LOW_H */
diff --git a/gdb/gdbserver/regcache.h b/gdb/gdbserver/regcache.h
index 98c3131..5ee4478 100644
--- a/gdb/gdbserver/regcache.h
+++ b/gdb/gdbserver/regcache.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef REGCACHE_H
-#define REGCACHE_H
+#ifndef GDBSERVER_REGCACHE_H
+#define GDBSERVER_REGCACHE_H
#include "common/common-regcache.h"
@@ -138,4 +138,4 @@ void collect_register_by_name (struct regcache *regcache,
ULONGEST regcache_raw_get_unsigned_by_name (struct regcache *regcache,
const char *name);
-#endif /* REGCACHE_H */
+#endif /* GDBSERVER_REGCACHE_H */
diff --git a/gdb/gdbserver/remote-utils.h b/gdb/gdbserver/remote-utils.h
index ca176b7..587afdb 100644
--- a/gdb/gdbserver/remote-utils.h
+++ b/gdb/gdbserver/remote-utils.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef REMOTE_UTILS_H
-#define REMOTE_UTILS_H
+#ifndef GDBSERVER_REMOTE_UTILS_H
+#define GDBSERVER_REMOTE_UTILS_H
extern int remote_debug;
@@ -69,4 +69,4 @@ int relocate_instruction (CORE_ADDR *to, CORE_ADDR oldloc);
void monitor_output (const char *msg);
-#endif /* REMOTE_UTILS_H */
+#endif /* GDBSERVER_REMOTE_UTILS_H */
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index 26d0dfb..400001a 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licens[...]
[diff truncated at 100000 bytes]