* ldmain.c (main): Rename BufferSize to ld_bufsz because HPUX

	defines BufferSize.  Increase buffer size by one.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 99f0cc0..0adf24c 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-15  Alan Modra  <amodra@bigpond.net.au>
+
+       * ldmain.c (main): Rename BufferSize to ld_bufsz because HPUX
+       defines BufferSize.  Increase buffer size by one.
+

 2001-09-14  Ralf Habacker <Ralf.Habacker@freenet.de>
 
        * pe-dll.c (pe_walk_relocs_of_symbol): Fix memory leak.
 2001-09-14  Ralf Habacker <Ralf.Habacker@freenet.de>
 
        * pe-dll.c (pe_walk_relocs_of_symbol): Fix memory leak.

diff --git a/ld/ldmain.c b/ld/ldmain.c
index afc386c..f9c5997 100644 (file)
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -325,12 +325,12 @@ main (argc, argv)
 
       if (saved_script_handle)
        {
 
       if (saved_script_handle)
        {

-         static const int BufferSize = 8192;
+         static const int ld_bufsz = 8193;

          size_t n;
          size_t n;

-         char *buf = xmalloc (BufferSize);
+         char *buf = xmalloc (ld_bufsz);

 
          rewind (saved_script_handle);
 
          rewind (saved_script_handle);

-         while ((n = fread (buf, 1, BufferSize - 1, saved_script_handle)) > 0)
+         while ((n = fread (buf, 1, ld_bufsz - 1, saved_script_handle)) > 0)

            {
              buf [n] = 0;
              info_msg (buf);
            {
              buf [n] = 0;
              info_msg (buf);