--- coreutils-5.2.1-orig/src/copy.c	Fri Mar 12 12:48:59 2004
+++ coreutils-5.2.1-omfs/src/copy.c	Fri Jun  4 13:36:28 2004
@@ -232,7 +232,12 @@
 
   /* Compare the source dev/ino from the open file to the incoming,
      saved ones obtained via a previous call to stat.  */
-  if (! SAME_INODE (*src_sb, src_open_sb))
+
+#define XSAME_INODE(Stat_buf_1, Stat_buf_2) \
+  ((Stat_buf_1).st_ino == (Stat_buf_2).st_ino \
+   && (int)(Stat_buf_1).st_dev == (int)(Stat_buf_2).st_dev)
+
+  if (! XSAME_INODE (*src_sb, src_open_sb))
     {
       error (0, 0,
 	     _("skipping file %s, as it was replaced while being copied"),
@@ -240,6 +245,8 @@
       return_val = -1;
       goto close_src_desc;
     }
+
+#undef XSAME_INODE
 
   /* These semantics are required for cp.
      The if-block will be taken in move_mode.  */