* A better patch.

svn path=/nixpkgs/trunk/; revision=6766
This commit is contained in:
Eelco Dolstra 2006-10-18 15:26:48 +00:00
parent 6ff020ad3a
commit efc2b12da5

View File

@ -1,6 +1,6 @@
diff -rc coreutils-5.97-orig/lib/strftime.c coreutils-5.97/lib/strftime.c diff -rc coreutils-5.97-orig/lib/strftime.c coreutils-5.97/lib/strftime.c
*** coreutils-5.97-orig/lib/strftime.c 2006-10-18 17:10:16.000000000 +0200 *** coreutils-5.97-orig/lib/strftime.c 2006-10-18 17:10:16.000000000 +0200
--- coreutils-5.97/lib/strftime.c 2006-10-18 17:08:16.000000000 +0200 --- coreutils-5.97/lib/strftime.c 2006-10-18 17:19:10.000000000 +0200
*************** ***************
*** 180,185 **** *** 180,185 ****
--- 180,191 ---- --- 180,191 ----
@ -8,9 +8,9 @@ diff -rc coreutils-5.97-orig/lib/strftime.c coreutils-5.97/lib/strftime.c
#endif #endif
+ #if FPRINTFTIME + #if FPRINTFTIME
+ #define advance(p, n) ; + #define advance(p, _n) ;
+ #else + #else
+ #define advance(p, n) p += _n; + #define advance(p, _n) p += _n;
+ #endif + #endif
+ +
#define add(n, f) \ #define add(n, f) \
@ -29,7 +29,7 @@ diff -rc coreutils-5.97-orig/lib/strftime.c coreutils-5.97/lib/strftime.c
memset_space (p, _delta); \ memset_space (p, _delta); \
} \ } \
f; \ f; \
! advance(p, n); \ ! advance(p, _n); \
} \ } \
i += _incr; \ i += _incr; \
} while (0) } while (0)