diff options
| author | Doug Evans <dje@google.com> | 2012-08-08 19:48:19 +0000 |
|---|---|---|
| committer | Doug Evans <dje@google.com> | 2012-08-08 19:48:19 +0000 |
| commit | e6712ff1b5f9f440889f298b326a12325d919680 (patch) | |
| tree | 19a392fd5da376b4950d15664c0485b497a90744 /gdb/common | |
| parent | ab854e54510727ba4db85875159f796e652e0b54 (diff) | |
| download | gdb-e6712ff1b5f9f440889f298b326a12325d919680.zip gdb-e6712ff1b5f9f440889f298b326a12325d919680.tar.gz gdb-e6712ff1b5f9f440889f298b326a12325d919680.tar.bz2 | |
* gdb_string.h: Moved to ...
* common/gdb_string.h: ... here.
* common/vec.h: Remove #ifndef GDBSERVER conditional inclusion of
gdb_string.h and gdb_assert.h.
gdbserver/
* configure.ac: Add check for strstr.
* config.in: Regenerate.
* configure: Regenerate.
* linux-thread-db.c: #include "gdb_vecs.h".
(try_thread_db_load_from_pdir_1): New arg "subdir". All callers
updated.
(try_thread_db_load_from_pdir): New arg "subdir". All callers updated.
(thread_db_load_search): Use a vector to iterate over path elements.
Handle text appearing after "$pdir".
gdbserver/
* Makefile.in (SFILES): Add gdb_vecs.c.
(OBS): Add gdb_vecs.o.
(gdb_vecs_h, host_defs_h): New variables.
(thread-db.o): Add $(gdb_vecs_h) dependency.
(gdb_vecs.o): New rule.
* thread-db.c: #include "gdb_vecs.h".
(thread_db_load_search): Use a vector to iterate over path elements.
Handle text appearing after "$pdir".
Diffstat (limited to 'gdb/common')
| -rw-r--r-- | gdb/common/gdb_string.h | 70 | ||||
| -rw-r--r-- | gdb/common/vec.h | 2 |
2 files changed, 70 insertions, 2 deletions
diff --git a/gdb/common/gdb_string.h b/gdb/common/gdb_string.h new file mode 100644 index 0000000..aa037df --- /dev/null +++ b/gdb/common/gdb_string.h @@ -0,0 +1,70 @@ +/* Portable <string.h> + + Copyright (C) 1995, 1998-2001, 2004, 2007-2012 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/>. */ + +#if !defined(GDB_STRING_H) +#define GDB_STRING_H + +#ifdef STDC_HEADERS +#include <string.h> +#ifdef HAVE_STRINGS_H +#include <strings.h> /* strcasecmp etc.. */ +#endif +#else +#ifdef HAVE_STRING_H +#include <string.h> +#else +#include <strings.h> +#endif + +#ifndef strchr +extern char *strchr (const char *, int); /* X3.159-1989 4.11.5.2 */ +#endif + +#ifndef strrchr +extern char *strrchr (const char *, int); /* X3.159-1989 4.11.5.5 */ +#endif + +#ifndef strtok +extern char *strtok (char *, const char *); /* X3.159-1989 4.11.5.8 */ +#endif + +#ifdef HAVE_MEMORY_H +#include <memory.h> +#else +extern void *memset (); +extern void *memcpy (); +extern void *memmove (); +extern int memcmp (); +#endif +#endif /* STDC_HEADERS */ + +#if !HAVE_DECL_STRERROR +#ifndef strerror +extern char *strerror (int); /* X3.159-1989 4.11.6.2 */ +#endif +#endif + +#if !HAVE_DECL_STRSTR +#ifndef strstr +extern char *strstr (const char *, const char *); /* X3.159-1989 4.11.5.7 */ +#endif +#endif + +#endif /* !defined(GDB_STRING_H) */ diff --git a/gdb/common/vec.h b/gdb/common/vec.h index fa15370..49116e1 100644 --- a/gdb/common/vec.h +++ b/gdb/common/vec.h @@ -22,10 +22,8 @@ #include <stddef.h> -#ifndef GDBSERVER #include "gdb_string.h" #include "gdb_assert.h" -#endif /* The macros here implement a set of templated vector types and associated interfaces. These templates are implemented with |