Date: Wed, 20 Aug 2014 12:42:22 -0700 From: Xin Li <delphij@delphij.net> To: Davide Italiano <davide@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r270227 - head/sys/sys Message-ID: <53F4FA1E.2000103@delphij.net> In-Reply-To: <201408201632.s7KGW2vF093636@svn.freebsd.org> References: <201408201632.s7KGW2vF093636@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On 08/20/14 09:32, Davide Italiano wrote: > Author: davide Date: Wed Aug 20 16:32:02 2014 New Revision: 270227 > URL: http://svnweb.freebsd.org/changeset/base/270227 > > Log: Make Bruce happy removing the "LL abomination" from time.h > It's not necessary in all the three instances because they already > have the correct type on all the supported arches. I'm not yet 100% sure (still building with some of my changes) but this looks like the change that broke powerpc build, I saw: In file included from /tank/delphij/head/cddl/usr.sbin/lockstat/../../../sys/cddl/compat/opensolaris/sys/time.h:32, from /tank/delphij/head/cddl/usr.sbin/lockstat/../../../sys/sys/stat.h:99, from /tank/delphij/head/cddl/usr.sbin/lockstat/../../../sys/cddl/compat/opensolaris/sys/stat.h:33, from /tank/delphij/head/cddl/usr.sbin/lockstat/../../../cddl/contrib/opensolaris/cmd/lockstat/lockstat.c:41: /tank/delphij/head/cddl/usr.sbin/lockstat/../../../sys/sys/time.h: In function 'timespec2bintime': /tank/delphij/head/cddl/usr.sbin/lockstat/../../../sys/sys/time.h:187: warning: integer constant is too large for 'long' type /tank/delphij/head/cddl/usr.sbin/lockstat/../../../sys/sys/time.h: In function 'timeval2bintime': /tank/delphij/head/cddl/usr.sbin/lockstat/../../../sys/sys/time.h:204: warning: integer constant is too large for 'long' type *** [lockstat.o] Error code 1 > Requested by: bde > > Modified: head/sys/sys/time.h > > Modified: head/sys/sys/time.h > ============================================================================== > > - --- head/sys/sys/time.h Wed Aug 20 16:09:05 2014 (r270226) > +++ head/sys/sys/time.h Wed Aug 20 16:32:02 2014 (r270227) @@ > -129,7 +129,7 @@ bintime_shift(struct bintime *_bt, int _ #define > SBT_1MS (SBT_1S / 1000) #define SBT_1US (SBT_1S / 1000000) #define > SBT_1NS (SBT_1S / 1000000000) -#define SBT_MAX > 0x7fffffffffffffffLL +#define SBT_MAX 0x7fffffffffffffff > > static __inline int sbintime_getsec(sbintime_t _sbt) @@ -184,7 > +184,7 @@ timespec2bintime(const struct timespec * > > _bt->sec = _ts->tv_sec; /* 18446744073 = int(2^64 / 1000000000) */ > - _bt->frac = _ts->tv_nsec * (uint64_t)18446744073LL; + _bt->frac = > _ts->tv_nsec * (uint64_t)18446744073; } > > static __inline void @@ -201,7 +201,7 @@ timeval2bintime(const > struct timeval *_t > > _bt->sec = _tv->tv_sec; /* 18446744073709 = int(2^64 / 1000000) */ > - _bt->frac = _tv->tv_usec * (uint64_t)18446744073709LL; + > _bt->frac = _tv->tv_usec * (uint64_t)18446744073709; } > > static __inline struct timespec > - -- Xin LI <delphij@delphij.net> https://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 iQIcBAEBCgAGBQJT9PoeAAoJEJW2GBstM+nsvAsP/3asjb/pBnK4jXnouHSSHmzf Hww9RbqtRrLVGmxl0utcI4yhs/5yvlm2wqGyhfqS4EY8dHEXE0N+gtHTXcZsrCSM g/3kJLGNj8oA6poNWXiNWo4fIVEmsOgwy/K2ef5EDs8moq19dP7/3x7ixjpEMIIz 80Yq9Zts1hNLICKlv2gKCONpGo5MyThquJytadXsRKz+McZnzR3XaXnHEIl5DB9+ OgZrKuYX4aGdWguppciS53IUvdn43jF5NZw+JFsf6SwXX5I7p4DjM1JE0R6wssKr jeuelME0xmki462VBlOBj+ul/JHEbF6aF8Nkp4VVf0oN527rRguJ1Qu7a2r/xbO1 Vcc28rO8o+oxbYotnCItlKtj2tXBivalc+gcHV+ySdVL/mIDAcPw0UVqYWIQAQul QHRW+zwnnVH5DRoHn0IBpDs1jlvu45xubc0iVpZPWHbE3FFt8HMcrqMQc+7ppSAn HJSQv4kxEhvR/jHzu3dY6cnziWsz5TZT4V4HfE9ut7QZELA5f95DR5HqT82dOf0x 4Wrc9uJT2yJayvK5E40/tuXMhipv+OOm/Gjs1gF/BHULHjMEc1LRRirwY0DAewwd 8p/cTmKNXpyTxi24kAvJ2mWKNdv4ncrjWIgLDJLZfMruA4SbaD3TCZEs0evmE1lH gbdwjyzcWuwHUMh+1TfG =1yEW -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53F4FA1E.2000103>