diff options
| author | Pedro Alves <pedro@codesourcery.com> | 2007-10-25 21:38:23 +0000 |
|---|---|---|
| committer | Pedro Alves <pedro@codesourcery.com> | 2007-10-25 21:38:23 +0000 |
| commit | 9f74b81d9c7333b46aebbea7dc82c314d12afaf3 (patch) | |
| tree | ca004664ddb978984ca2fba15cb986d39aa004eb | |
| parent | f250b29df882757af3f4f96ee691cc4dec5c48a3 (diff) | |
| download | binutils-redhat-9f74b81d9c7333b46aebbea7dc82c314d12afaf3.tar.gz | |
2007-10-25 Pedro Alves <pedro_alves@portugalmail.pt>gdb_6_7_1-2007-10-29-releasegdb_6_7-branch
PR gdb/2339
* bfd-in.h (STRING_COMMA_LEN): Don't handle NULL STR case.
* bfd-in2.h: Regenerate.
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/bfd-in.h | 5 | ||||
| -rw-r--r-- | bfd/bfd-in2.h | 5 |
3 files changed, 10 insertions, 6 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 9366ed5d34..c3e806c660 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2007-10-25 Pedro Alves <pedro_alves@portugalmail.pt> + + PR gdb/2339 + * bfd-in.h (STRING_COMMA_LEN): Don't handle NULL STR case. + * bfd-in2.h: Regenerate. + 2007-09-04 Michael Snyder <msnyder@access-company.com> * elf32-bfin.c (howto_table): Cut and paste error? diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index 2e70a7391f..6a55cb1cfb 100644 --- a/bfd/bfd-in.h +++ b/bfd/bfd-in.h @@ -46,9 +46,8 @@ extern "C" { /* This is a utility macro to handle the situation where the code wants to place a constant string into the code, followed by a comma and then the length of the string. Doing this by hand - is error prone, so using this macro is safer. The macro will - also safely handle the case where a NULL is passed as the arg. */ -#define STRING_COMMA_LEN(STR) (STR), ((STR) ? sizeof (STR) - 1 : 0) + is error prone, so using this macro is safer. */ +#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1) /* Unfortunately it is not possible to use the STRING_COMMA_LEN macro to create the arguments to another macro, since the preprocessor will mis-count the number of arguments to the outer macro (by not diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 317d32e01d..503e05e4ff 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -53,9 +53,8 @@ extern "C" { /* This is a utility macro to handle the situation where the code wants to place a constant string into the code, followed by a comma and then the length of the string. Doing this by hand - is error prone, so using this macro is safer. The macro will - also safely handle the case where a NULL is passed as the arg. */ -#define STRING_COMMA_LEN(STR) (STR), ((STR) ? sizeof (STR) - 1 : 0) + is error prone, so using this macro is safer. */ +#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1) /* Unfortunately it is not possible to use the STRING_COMMA_LEN macro to create the arguments to another macro, since the preprocessor will mis-count the number of arguments to the outer macro (by not |