diff options
author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2004-05-21 20:23:44 +0000 |
---|---|---|
committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2004-05-21 20:23:44 +0000 |
commit | 54c8dbbf02ab898df1251a6323efffebe68c55e0 (patch) | |
tree | 32e0c38ddde06552627ea6acab0da40618c89575 /gnu/usr.bin/binutils/gdb/config/nm-sysv4.h | |
parent | 7069eb4ee48ce3c8978f86920c62292e57f239da (diff) |
Resolve conflicts for GDB 6.1. Add local patches.
ok deraadt@
Diffstat (limited to 'gnu/usr.bin/binutils/gdb/config/nm-sysv4.h')
-rw-r--r-- | gnu/usr.bin/binutils/gdb/config/nm-sysv4.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/gnu/usr.bin/binutils/gdb/config/nm-sysv4.h b/gnu/usr.bin/binutils/gdb/config/nm-sysv4.h index e4978d0bcc6..4b4f09897bc 100644 --- a/gnu/usr.bin/binutils/gdb/config/nm-sysv4.h +++ b/gnu/usr.bin/binutils/gdb/config/nm-sysv4.h @@ -1,28 +1,28 @@ /* Definitions for running gdb on a host machine running any flavor of SVR4. - Copyright 1991, 1992 Free Software Foundation, Inc. + Copyright 1991, 1992, 1993, 1998 Free Software Foundation, Inc. Written by Fred Fish at Cygnus Support (fnf@cygnus.com). -This file is part of GDB. + 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 2 of the License, or -(at your option) any later version. + 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 2 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. + 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, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#include "solib.h" /* Support for shared libraries. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* Use SVR4 style shared library support */ #define SVR4_SHARED_LIBS +#include "solib.h" /* SVR4 has /proc support, so use it instead of ptrace. */ |