Module Name: src
Committed By: christos
Date: Wed Aug 17 09:32:55 UTC 2011
Modified Files:
src/external/bsd/ntp/dist/lib/isc/unix: time.c
src/external/bsd/ntp/lib/libiscntp: Makefile
Log Message:
widen the type to avoid gcc warning about shifting too much.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/ntp/dist/lib/isc/unix/time.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/lib/libiscntp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/dist/lib/isc/unix/time.c
diff -u src/external/bsd/ntp/dist/lib/isc/unix/time.c:1.1.1.1 src/external/bsd/ntp/dist/lib/isc/unix/time.c:1.2
--- src/external/bsd/ntp/dist/lib/isc/unix/time.c:1.1.1.1 Sun Dec 13 11:54:32 2009
+++ src/external/bsd/ntp/dist/lib/isc/unix/time.c Wed Aug 17 05:32:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: time.c,v 1.1.1.1 2009/12/13 16:54:32 kardel Exp $ */
+/* $NetBSD: time.c,v 1.2 2011/08/17 09:32:55 christos Exp $ */
/*
* Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
@@ -373,7 +373,7 @@
(time_t)0.5 != 0.5 && /* Not a floating point type. */
(i = (time_t)-1) != 4294967295u && /* Is signed. */
(seconds &
- (1U << (sizeof(time_t) * CHAR_BIT - 1))) != 0U) { /* Negative. */
+ (1ULL << (sizeof(time_t) * CHAR_BIT - 1))) != 0ULL) { /* Negative. */
/*
* This UNUSED() is here to shut up the IRIX compiler:
* variable "i" was set but never used
Index: src/external/bsd/ntp/lib/libiscntp/Makefile
diff -u src/external/bsd/ntp/lib/libiscntp/Makefile:1.2 src/external/bsd/ntp/lib/libiscntp/Makefile:1.3
--- src/external/bsd/ntp/lib/libiscntp/Makefile:1.2 Tue Jun 21 22:49:42 2011
+++ src/external/bsd/ntp/lib/libiscntp/Makefile Wed Aug 17 05:32:55 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/06/22 02:49:42 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/08/17 09:32:55 christos Exp $
LIBISPRIVATE=yes
@@ -42,8 +42,3 @@
sockaddr.c
.include <bsd.lib.mk>
-
-# XXX
-.if ${HAVE_GCC} == 45
-COPTS.time.c+= -Wno-error
-.endif
