Date: Mon, 4 Jun 2012 16:10:43 GMT From: Brooks Davis <brooks@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 212266 for review Message-ID: <201206041610.q54GAh1g077674@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@212266?ac=10 Change 212266 by brooks@brooks_ecr_current on 2012/06/04 16:10:06 Fix compile on MIPS64 (and presumably other 64-bit architectures) Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/geom/geom_map.c#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/geom/geom_map.c#2 (text+ko) ==== @@ -119,13 +119,13 @@ g_slice_dumpconf(sb, indent, gp, cp, pp); if (pp != NULL) { if (indent == NULL) { - sbuf_printf(sb, " entry %lld", sc->entry[pp->index]); - sbuf_printf(sb, " dsize %lld", sc->dsize[pp->index]); + sbuf_printf(sb, " entry %jd", (intmax_t)sc->entry[pp->index]); + sbuf_printf(sb, " dsize %jd", (intmax_t)sc->dsize[pp->index]); } else { - sbuf_printf(sb, "%s<entry>%lld</entry>\n", indent, - sc->entry[pp->index]); - sbuf_printf(sb, "%s<dsize>%lld</dsize>\n", indent, - sc->dsize[pp->index]); + sbuf_printf(sb, "%s<entry>%jd</entry>\n", indent, + (intmax_t)sc->entry[pp->index]); + sbuf_printf(sb, "%s<dsize>%jd</dsize>\n", indent, + (intmax_t)sc->dsize[pp->index]); } } } @@ -153,8 +153,8 @@ return (1); if (bootverbose) { - printf("MAP: search key \"%s\" from 0x%llx, step 0x%llx\n", - search_key, search_start, search_step); + printf("MAP: search key \"%s\" from 0x%jx, step 0x%jx\n", + search_key, (intmax_t)search_start, (intmax_t)search_step); } /* error if search_key is empty */ @@ -321,9 +321,10 @@ } if (bootverbose) { - printf("MAP: %llxx%llx, data=%llxx%llx " + printf("MAP: %lxx%lx, data=%lxx%lx " "\"/dev/map/%s\"\n", - start, size, offset, dsize, name); + (intmax_t)start, (intmax_t)size, (intmax_t)offset, + (intmax_t)dsize, name); } sc->offset[i] = start;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206041610.q54GAh1g077674>