diff options
| author | delphij <delphij@FreeBSD.org> | 2007-06-17 00:43:50 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2007-06-17 00:43:50 +0000 |
| commit | 6a4276ae14305505c7daf6c5c38cf89b26e623a6 (patch) | |
| tree | 403f794fe1cde4ed73d497563bf3ce54abfb8611 /gnu/usr.bin/diff/context.c.diff | |
| parent | f9596e5996019a0bbb1b184644b8d2eeba1ff2ed (diff) | |
| download | FreeBSD-src-6a4276ae14305505c7daf6c5c38cf89b26e623a6.zip FreeBSD-src-6a4276ae14305505c7daf6c5c38cf89b26e623a6.tar.gz | |
Fix build on arm: time_t on arm is 64 bits while long is
32 bits, so subsequent compile time assertion:
sizeof inf->stat.st_mtime <= sizeof sec
Would fail because of that. This change is suitable for
general consumption as well, but fix it in our local
patchset as we are near a code freeze.
Submitted by: cognet
Diffstat (limited to 'gnu/usr.bin/diff/context.c.diff')
| -rw-r--r-- | gnu/usr.bin/diff/context.c.diff | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gnu/usr.bin/diff/context.c.diff b/gnu/usr.bin/diff/context.c.diff index d7d2073..ee1ab21 100644 --- a/gnu/usr.bin/diff/context.c.diff +++ b/gnu/usr.bin/diff/context.c.diff @@ -1,6 +1,6 @@ $FreeBSD$ --- context.c.orig 2004-04-12 15:44:35.000000000 +0800 -+++ context.c 2007-06-15 14:51:05.497679903 +0800 ++++ context.c 2007-06-16 22:25:11.705063242 +0800 @@ -29,7 +29,7 @@ # define TIMESPEC_NS(timespec) 0 #endif @@ -10,7 +10,7 @@ $FreeBSD$ static char const *find_function (char const * const *, lin); static struct change *find_hunk (struct change *); -@@ -57,7 +57,7 @@ +@@ -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); @@ -18,4 +18,11 @@ $FreeBSD$ + long nsec = TIMESPEC_NS (inf->stat.st_mtimespec); if (! (tm && nstrftime (buf, sizeof buf, time_format, tm, 0, nsec))) { - long int sec = inf->stat.st_mtime; +- 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); + } |
