Rename uses of futimens -> gl_futimens; glibc now declares the former.

* src/copy.c (copy_reg): Reflect renaming: futimens -> gl_futimens.
* src/touch.c (touch): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 135f18dcc1d12e95361343d48b6d77abfc8ef2c0..04d5d4208e6e8d9fd0f27e39f646e9534b370b9d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-19  Jim Meyering  <jim@meyering.net>
+
+       Rename uses of futimens -> gl_futimens; glibc now declares the former.
+       * src/copy.c (copy_reg): Reflect renaming: futimens -> gl_futimens.
+       * src/touch.c (touch): Likewise.
+
 2007-05-18  Jim Meyering  <jim@meyering.net>
 
        * Makefile.maint (my-distcheck): Remove -pedantic from $(CFLAGS)

diff --git a/src/copy.c b/src/copy.c
index 81636ae7b6445a76b3e84971f09797aec07606c4..f4e3b174b820bc7e10f2d14b39b0d82ec4be5762 100644 (file)
--- a/src/copy.c
+++ b/src/copy.c
@@ -551,7 +551,7 @@ copy_reg (char const *src_name, char const *dst_name,
       timespec[0] = get_stat_atime (src_sb);
       timespec[1] = get_stat_mtime (src_sb);
 
-      if (futimens (dest_desc, dst_name, timespec) != 0)
+      if (gl_futimens (dest_desc, dst_name, timespec) != 0)
        {
          error (0, errno, _("preserving times for %s"), quote (dst_name));
          if (x->require_preserve)

diff --git a/src/touch.c b/src/touch.c
index cb54f4828f24ece98d0a66bd19380a091408cbbc..f9f2c10d07df1d70c676bcc246b9e4b3926033d0 100644 (file)
--- a/src/touch.c
+++ b/src/touch.c
@@ -1,5 +1,5 @@
 /* touch -- change modification and access times of files
-   Copyright (C) 87, 1989-1991, 1995-2005 Free Software Foundation, Inc.
+   Copyright (C) 87, 1989-1991, 1995-2005, 2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -182,7 +182,7 @@ touch (const char *file)
       t = timespec;
     }
 
-  ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
+  ok = (gl_futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
 
   if (fd == STDIN_FILENO)
     {