rename.c (simple_copy): Only define if it is going to be used.

  (smart_rename): Mark the preserve_dates parameter as possibly	being unused.

resres.c (write_res_data): Prevent a potential compile time warning by casting
  the return value from fwrite.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index d60f6a2..f47a96f 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,12 @@
+2005-06-16  Nick Clifton  <nickc@redhat.com>
+
+       * rename.c (simple_copy): Only define if it is going to be used.
+       (smart_rename): Mark the preserve_dates parameter as possibly
+       being unused.
+
+       * resres.c (write_res_data): Prevent a potential compile time
+       warning by casting the return value from fwrite.
+
 2005-06-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR 995

diff --git a/binutils/rename.c b/binutils/rename.c
index 74d04d4..7d21cb3 100644 (file)
--- a/binutils/rename.c
+++ b/binutils/rename.c
@@ -37,6 +37,7 @@
 #define O_BINARY 0
 #endif
 
+#if ! defined (_WIN32) || defined (__CYGWIN32__)
 static int simple_copy (const char *, const char *);
 
 /* The number of bytes to copy at once.  */
@@ -88,6 +89,7 @@ simple_copy (const char *from, const char *to)
     }
   return 0;
 }
+#endif /* __CYGWIN32__ or not _WIN32 */
 
 /* Set the times of the file DESTINATION to be the same as those in
    STATBUF.  */
@@ -140,7 +142,7 @@ set_times (const char *destination, const struct stat *statbuf)
    Return 0 if ok, -1 if error.  */
 
 int
-smart_rename (const char *from, const char *to, int preserve_dates)
+smart_rename (const char *from, const char *to, int preserve_dates ATTRIBUTE_UNUSED)
 {
   bfd_boolean exists;
   struct stat s;

diff --git a/binutils/resres.c b/binutils/resres.c
index 54d2a0c..1489d5e 100644 (file)
--- a/binutils/resres.c
+++ b/binutils/resres.c
@@ -408,7 +408,7 @@ write_res_data (data, size, count)
      size_t size;
      int count;
 {
-  if (fwrite (data, size, count, fres) != (size_t) count)
+  if ((size_t) fwrite (data, size, count, fres) != (size_t) count)
     fatal ("%s: could not write to file", filename);
 }