On Sat, Jun 18, 2011 at 9:56 AM, Ben Laurie <b...@freebsd.org> wrote: > Author: benl > Date: Sat Jun 18 13:56:33 2011 > New Revision: 223262 > URL: http://svn.freebsd.org/changeset/base/223262 > > Log: > Fix clang warnings. > > Approved by: philip (mentor) > > > Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c > ============================================================================== > --- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c Sat > Jun 18 13:54:36 2011 (r223261) > +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c Sat > Jun 18 13:56:33 2011 (r223262) > @@ -45,6 +45,7 @@ > #include <assert.h> > #include <libgen.h> > #include <limits.h> > +#include <stdint.h> > > #include <dt_impl.h> > > @@ -811,15 +812,14 @@ dt_basename(char *str) > ulong_t > dt_popc(ulong_t x) > { > -#ifdef _ILP32 > +#if defined(_ILP32) > x = x - ((x >> 1) & 0x55555555UL); > x = (x & 0x33333333UL) + ((x >> 2) & 0x33333333UL); > x = (x + (x >> 4)) & 0x0F0F0F0FUL; > x = x + (x >> 8); > x = x + (x >> 16); > return (x & 0x3F); > -#endif > -#ifdef _LP64 > +#elif defined(_LP64) > x = x - ((x >> 1) & 0x5555555555555555ULL); > x = (x & 0x3333333333333333ULL) + ((x >> 2) & 0x3333333333333333ULL); > x = (x + (x >> 4)) & 0x0F0F0F0F0F0F0F0FULL; > @@ -827,6 +827,8 @@ dt_popc(ulong_t x) > x = x + (x >> 16); > x = x + (x >> 32); > return (x & 0x7F); > +#else > +# warning need td_popc() implementation
We seem to still be in dt_popc(), here. -Ben Kaduk > #endif > } > _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
