Module Name: src Committed By: msaitoh Date: Mon Jul 22 04:55:09 UTC 2013
Modified Files: src/lib/libc/time: localtime.c Log Message: Both increment_overflow() and normalize_overflow() have two different declarations. One must be *32(). Fixes compile error observed on sparc64. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/lib/libc/time/localtime.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/libc/time/localtime.c diff -u src/lib/libc/time/localtime.c:1.75 src/lib/libc/time/localtime.c:1.76 --- src/lib/libc/time/localtime.c:1.75 Wed Jul 17 23:09:26 2013 +++ src/lib/libc/time/localtime.c Mon Jul 22 04:55:09 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: localtime.c,v 1.75 2013/07/17 23:09:26 christos Exp $ */ +/* $NetBSD: localtime.c,v 1.76 2013/07/22 04:55:09 msaitoh Exp $ */ /* ** This file is in the public domain, so clarified as of @@ -10,7 +10,7 @@ #if 0 static char elsieid[] = "@(#)localtime.c 8.17"; #else -__RCSID("$NetBSD: localtime.c,v 1.75 2013/07/17 23:09:26 christos Exp $"); +__RCSID("$NetBSD: localtime.c,v 1.76 2013/07/22 04:55:09 msaitoh Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -169,12 +169,12 @@ static struct tm * gmtsub(const timezone static struct tm * localsub(const timezone_t sp, const time_t *timep, const int_fast32_t offset, struct tm *tmp); static int increment_overflow(int * number, int delta); +static int increment_overflow32(int_fast32_t * number, int delta); static int leaps_thru_end_of(int y) ATTRIBUTE_PURE; -static int increment_overflow(int_fast32_t * number, int delta); -static int normalize_overflow(int_fast32_t * tensptr, - int * unitsptr, int base); static int normalize_overflow(int * tensptr, int * unitsptr, int base); +static int normalize_overflow32(int_fast32_t * tensptr, + int * unitsptr, int base); static void settzname(void); static time_t time1(const timezone_t sp, struct tm * const tmp, subfun_t funcp, const int_fast32_t offset);