From a941b72fdcab943e0f1e1808f5006a4bcaefca52 Mon Sep 17 00:00:00 2001 From: obrien Date: Fri, 17 Aug 2012 18:20:38 +0000 Subject: Catch up with the subversion conversion and apply these build-time patches. --- gnu/usr.bin/diff/context.c.diff | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 gnu/usr.bin/diff/context.c.diff (limited to 'gnu/usr.bin/diff/context.c.diff') diff --git a/gnu/usr.bin/diff/context.c.diff b/gnu/usr.bin/diff/context.c.diff deleted file mode 100644 index 06cfb12..0000000 --- a/gnu/usr.bin/diff/context.c.diff +++ /dev/null @@ -1,28 +0,0 @@ -$FreeBSD$ ---- context.c.orig 2004-04-12 15:44:35.000000000 +0800 -+++ context.c 2007-06-16 22:25:11.705063242 +0800 -@@ -29,7 +29,7 @@ - # define TIMESPEC_NS(timespec) 0 - #endif - --size_t nstrftime (char *, size_t, char const *, struct tm const *, int, int); -+size_t nstrftime (char *, size_t, char const *, struct tm const *, int, long); - - static char const *find_function (char const * const *, lin); - static struct change *find_hunk (struct change *); -@@ -57,12 +57,12 @@ - char buf[MAX (INT_STRLEN_BOUND (int) + 32, - INT_STRLEN_BOUND (time_t) + 11)]; - struct tm const *tm = localtime (&inf->stat.st_mtime); -- int nsec = TIMESPEC_NS (inf->stat.st_mtim); -+ long nsec = TIMESPEC_NS (inf->stat.st_mtim); - if (! (tm && nstrftime (buf, sizeof buf, time_format, tm, 0, nsec))) - { -- long int sec = inf->stat.st_mtime; -+ time_t sec = inf->stat.st_mtime; - verify (info_preserved, sizeof inf->stat.st_mtime <= sizeof sec); -- sprintf (buf, "%ld.%.9d", sec, nsec); -+ sprintf (buf, "%jd.%.9d", (intmax_t)sec, nsec); - } - fprintf (outfile, "%s %s\t%s\n", mark, inf->name, buf); - } -- cgit v1.1