diff options
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/Makefile.in | 2 | ||||
| -rw-r--r-- | gdb/common/common-defs.h | 30 | ||||
| -rw-r--r-- | gdb/defs.h | 3 | ||||
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/gdbserver/server.h | 3 |
6 files changed, 45 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c836b35..bcaf17c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2014-07-30 Gary Benson <gbenson@redhat.com> + * common/common-defs.h: New file. + * Makefile.in (HFILES_NO_SRCDIR): Add common/common-defs.h. + * defs.h: Include common-defs.h. + Do not include config.h or build-gnulib/config.h. + +2014-07-30 Gary Benson <gbenson@redhat.com> + * common/common-utils.h: Do not include config.h. * nat/linux-btrace.h: Likewise. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index ce15501..8361030 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -935,7 +935,7 @@ gdb_bfd.h sparc-ravenscar-thread.h ppc-ravenscar-thread.h nat/linux-btrace.h \ ctf.h nat/i386-cpuid.h nat/i386-gcc-cpuid.h target/resume.h \ target/wait.h target/waitstatus.h nat/linux-nat.h nat/linux-waitpid.h \ common/print-utils.h common/rsp-low.h nat/i386-dregs.h x86-linux-nat.h \ -i386-linux-nat.h +i386-linux-nat.h common/common-defs.h # Header files that already have srcdir in them, or which are in objdir. diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h new file mode 100644 index 0000000..9e397d9 --- /dev/null +++ b/gdb/common/common-defs.h @@ -0,0 +1,30 @@ +/* Common definitions. + + Copyright (C) 1986-2014 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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 + +#include "config.h" +#ifdef GDBSERVER +#include "build-gnulib-gdbserver/config.h" +#else +#include "build-gnulib/config.h" +#endif + +#endif /* COMMON_DEFS_H */ @@ -25,8 +25,7 @@ # error gdbserver should not include gdb/defs.h #endif -#include "config.h" /* Generated by configure. */ -#include "build-gnulib/config.h" +#include "common-defs.h" #include <sys/types.h> #include <stdio.h> diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index df20e8c..d0fa61d 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,10 @@ 2014-07-30 Gary Benson <gbenson@redhat.com> + * server.h: Include common-defs.h. + Do not include config.h or build-gnulib-gdbserver/config.h. + +2014-07-30 Gary Benson <gbenson@redhat.com> + * hostio-errno.c: Move server.h to top of includes list. * inferiors.c: Likewise. * linux-x86-low.c: Likewise. diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index 2d55513..ef66a32 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -19,8 +19,7 @@ #ifndef SERVER_H #define SERVER_H -#include "config.h" -#include "build-gnulib-gdbserver/config.h" +#include "common-defs.h" #ifdef __MINGW32CE__ #include "wincecompat.h" |