X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ba2133d6add082b059728074febdac6c520a4351..fdf74bede07402b9d72ed0613557f26f24de43bc:/byteorder.h

diff --git a/byteorder.h b/byteorder.h
index 3bf50c26..6dd9b459 100644
--- a/byteorder.h
+++ b/byteorder.h
@@ -2,11 +2,12 @@
  * Simple byteorder handling.
  *
  * Copyright (C) 1992-1995 Andrew Tridgell
- * Copyright (C) 2007 Wayne Davison
+ * Copyright (C) 2007-2008 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #undef CAREFUL_ALIGNMENT
@@ -34,16 +34,6 @@
 #define UVAL(buf,pos) ((uint32)CVAL(buf,pos))
 #define SCVAL(buf,pos,val) (CVAL(buf,pos) = (val))
 
-/* Our 64-bit numbers are sent in MSB-first order so that we can use
- * the highest bits to indicate the number of bytes sent. */
-#define NVAL2(b,m) ((UVAL(b,0)&~(m))<<8|UVAL(b,1))
-#define NVAL3(b,m) (NVAL2(b,m)<<8|UVAL(b,2))
-#define NVAL4(b,m) (NVAL3(b,m)<<8|UVAL(b,3))
-#define NVAL5(b,m) ((int64)NVAL4(b,m)<<8|UVAL(b,4))
-#define NVAL6(b,m) (NVAL5(b,m)<<8|UVAL(b,5))
-#define NVAL7(b,m) (NVAL6(b,m)<<8|UVAL(b,6))
-#define NVAL8(b,m) (NVAL7(b,m)<<8|UVAL(b,7))
-
 #if CAREFUL_ALIGNMENT
 #define PVAL(buf,pos) (UVAL(buf,pos)|UVAL(buf,(pos)+1)<<8)
 #define IVAL(buf,pos) (PVAL(buf,pos)|PVAL(buf,(pos)+2)<<16)