X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d622d4bf30c3acd56bb6b3832643ef95d1cbd4cb..031fa9ad4d17da5759bade845985e24ef2d14c98:/io.c diff --git a/io.c b/io.c index e2dc152a..9b951005 100644 --- a/io.c +++ b/io.c @@ -750,14 +750,13 @@ int64 read_longint(int f) if ((int32)ret != (int32)0xffffffff) return ret; -#ifdef INT64_IS_OFF_T - if (sizeof (int64) < 8) { - rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n"); - exit_cleanup(RERR_UNSUPPORTED); - } -#endif +#if SIZEOF_INT64 < 8 + rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n"); + exit_cleanup(RERR_UNSUPPORTED); +#else readfd(f,b,8); ret = IVAL(b,0) | (((int64)IVAL(b,4))<<32); +#endif return ret; } @@ -1084,18 +1083,16 @@ void write_longint(int f, int64 x) return; } -#ifdef INT64_IS_OFF_T - if (sizeof (int64) < 8) { - rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n"); - exit_cleanup(RERR_UNSUPPORTED); - } -#endif - +#if SIZEOF_INT64 < 8 + rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n"); + exit_cleanup(RERR_UNSUPPORTED); +#else write_int(f, (int32)0xFFFFFFFF); SIVAL(b,0,(x&0xFFFFFFFF)); SIVAL(b,4,((x>>32)&0xFFFFFFFF)); writefd(f,b,8); +#endif } void write_buf(int f,char *buf,size_t len)