diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9366ed5d347..c3e806c6605 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 2e70a7391fd..6a55cb1cfb5 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 317d32e01dd..503e05e4ff8 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