2 files changed, 7 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index aa8836e9e..f53127240 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
      [version.h]
      enter 3.6
  - (bal) The days of lack of int64_t support are over.  Sorry kids.
+ - (bal) scp.c 'limit' conflicts with Cray.  Rename to 'limitbw'
 
 20030318
  - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
@@ -1232,4 +1233,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2633.2.1 2003/03/21 00:51:35 mouring Exp $
+$Id: ChangeLog,v 1.2633.2.2 2003/03/21 00:54:03 mouring Exp $
diff --git a/scp.c b/scp.c
index ab67c0bb8..35d4c5f71 100644
--- a/scp.c
+++ b/scp.c
@@ -96,7 +96,7 @@ void bwlimit(int);
 arglist args;
 
 /* Bandwidth limit */
-off_t limit = 0;
+off_t limitbw = 0;
 
 /* Name of current file being transferred. */
 char *curfile;
@@ -251,7 +251,7 @@ main(argc, argv)
                         speed = strtod(optarg, &endp);
                         if (speed <= 0 || *endp != '\0')
                                 usage();
-                        limit = speed * 1024;
+                        limitbw = speed * 1024;
                         break;
                 case 'p':
                         pflag = 1;
@@ -594,7 +594,7 @@ next:			(void) close(fd);
                                         haderr = result >= 0 ? EIO : errno;
                                 statbytes += result;
                         }
-                        if (limit)
+                        if (limitbw)
                                 bwlimit(amt);
                 }
                 if (showprogress)
@@ -688,7 +688,7 @@ bwlimit(int amount)
                 return;
 
         lamt *= 8;
-        wait = (double)1000000L * lamt / limit;
+        wait = (double)1000000L * lamt / limitbw;
 
         bwstart.tv_sec = wait / 1000000L;
         bwstart.tv_usec = wait % 1000000L;
@@ -917,7 +917,7 @@ bad:			run_err("%s: %s", np, strerror(errno));
                                 statbytes += j;
                         } while (amt > 0);
                 
-                        if (limit)
+                        if (limitbw)
                                 bwlimit(4096);
 
                         if (count == bp->cnt) {