2001-07-25 Dave Brolley <brolley@redhat.com>

	* objdump.c (SKIP_ZEROES): Only define it if it is not already defined.
	(SKIP_ZEROES_AT_END): Only define it if it is not already defined.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 03e403a..93aba19 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-25  Dave Brolley  <brolley@redhat.com>
+
+       * objdump.c (SKIP_ZEROES): Only define it if it is not already defined.
+       (SKIP_ZEROES_AT_END): Only define it if it is not already defined.
+
 2001-07-19  Nick Clifton  <nickc@cambridge.redhat.com>
 
        * README: Update for 2.11.  Change bug reporting email address.

diff --git a/binutils/objdump.c b/binutils/objdump.c
index 96b6031..4b64bd6 100644 (file)
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -1222,7 +1222,9 @@ objdump_sprintf (va_alist)
 /* The number of zeroes we want to see before we start skipping them.
    The number is arbitrarily chosen.  */
 
+#ifndef SKIP_ZEROES
 #define SKIP_ZEROES (8)
+#endif
 
 /* The number of zeroes to skip at the end of a section.  If the
    number of zeroes at the end is between SKIP_ZEROES_AT_END and
@@ -1231,7 +1233,9 @@ objdump_sprintf (va_alist)
    attempt to avoid disassembling zeroes inserted by section
    alignment.  */
 
+#ifndef SKIP_ZEROES_AT_END
 #define SKIP_ZEROES_AT_END (3)
+#endif
 
 /* Disassemble some data in memory between given values.  */