head 1.11; access; symbols pkgsrc-2026Q1:1.11.0.102 pkgsrc-2026Q1-base:1.11 pkgsrc-2025Q4:1.11.0.100 pkgsrc-2025Q4-base:1.11 pkgsrc-2025Q3:1.11.0.98 pkgsrc-2025Q3-base:1.11 pkgsrc-2025Q2:1.11.0.96 pkgsrc-2025Q2-base:1.11 pkgsrc-2025Q1:1.11.0.94 pkgsrc-2025Q1-base:1.11 pkgsrc-2024Q4:1.11.0.92 pkgsrc-2024Q4-base:1.11 pkgsrc-2024Q3:1.11.0.90 pkgsrc-2024Q3-base:1.11 pkgsrc-2024Q2:1.11.0.88 pkgsrc-2024Q2-base:1.11 pkgsrc-2024Q1:1.11.0.86 pkgsrc-2024Q1-base:1.11 pkgsrc-2023Q4:1.11.0.84 pkgsrc-2023Q4-base:1.11 pkgsrc-2023Q3:1.11.0.82 pkgsrc-2023Q3-base:1.11 pkgsrc-2023Q2:1.11.0.80 pkgsrc-2023Q2-base:1.11 pkgsrc-2023Q1:1.11.0.78 pkgsrc-2023Q1-base:1.11 pkgsrc-2022Q4:1.11.0.76 pkgsrc-2022Q4-base:1.11 pkgsrc-2022Q3:1.11.0.74 pkgsrc-2022Q3-base:1.11 pkgsrc-2022Q2:1.11.0.72 pkgsrc-2022Q2-base:1.11 pkgsrc-2022Q1:1.11.0.70 pkgsrc-2022Q1-base:1.11 pkgsrc-2021Q4:1.11.0.68 pkgsrc-2021Q4-base:1.11 pkgsrc-2021Q3:1.11.0.66 pkgsrc-2021Q3-base:1.11 pkgsrc-2021Q2:1.11.0.64 pkgsrc-2021Q2-base:1.11 pkgsrc-2021Q1:1.11.0.62 pkgsrc-2021Q1-base:1.11 pkgsrc-2020Q4:1.11.0.60 pkgsrc-2020Q4-base:1.11 pkgsrc-2020Q3:1.11.0.58 pkgsrc-2020Q3-base:1.11 pkgsrc-2020Q2:1.11.0.54 pkgsrc-2020Q2-base:1.11 pkgsrc-2020Q1:1.11.0.34 pkgsrc-2020Q1-base:1.11 pkgsrc-2019Q4:1.11.0.56 pkgsrc-2019Q4-base:1.11 pkgsrc-2019Q3:1.11.0.52 pkgsrc-2019Q3-base:1.11 pkgsrc-2019Q2:1.11.0.50 pkgsrc-2019Q2-base:1.11 pkgsrc-2019Q1:1.11.0.48 pkgsrc-2019Q1-base:1.11 pkgsrc-2018Q4:1.11.0.46 pkgsrc-2018Q4-base:1.11 pkgsrc-2018Q3:1.11.0.44 pkgsrc-2018Q3-base:1.11 pkgsrc-2018Q2:1.11.0.42 pkgsrc-2018Q2-base:1.11 pkgsrc-2018Q1:1.11.0.40 pkgsrc-2018Q1-base:1.11 pkgsrc-2017Q4:1.11.0.38 pkgsrc-2017Q4-base:1.11 pkgsrc-2017Q3:1.11.0.36 pkgsrc-2017Q3-base:1.11 pkgsrc-2017Q2:1.11.0.32 pkgsrc-2017Q2-base:1.11 pkgsrc-2017Q1:1.11.0.30 pkgsrc-2017Q1-base:1.11 pkgsrc-2016Q4:1.11.0.28 pkgsrc-2016Q4-base:1.11 pkgsrc-2016Q3:1.11.0.26 pkgsrc-2016Q3-base:1.11 pkgsrc-2016Q2:1.11.0.24 pkgsrc-2016Q2-base:1.11 pkgsrc-2016Q1:1.11.0.22 pkgsrc-2016Q1-base:1.11 pkgsrc-2015Q4:1.11.0.20 pkgsrc-2015Q4-base:1.11 pkgsrc-2015Q3:1.11.0.18 pkgsrc-2015Q3-base:1.11 pkgsrc-2015Q2:1.11.0.16 pkgsrc-2015Q2-base:1.11 pkgsrc-2015Q1:1.11.0.14 pkgsrc-2015Q1-base:1.11 pkgsrc-2014Q4:1.11.0.12 pkgsrc-2014Q4-base:1.11 pkgsrc-2014Q3:1.11.0.10 pkgsrc-2014Q3-base:1.11 pkgsrc-2014Q2:1.11.0.8 pkgsrc-2014Q2-base:1.11 pkgsrc-2014Q1:1.11.0.6 pkgsrc-2014Q1-base:1.11 pkgsrc-2013Q4:1.11.0.4 pkgsrc-2013Q4-base:1.11 pkgsrc-2013Q3:1.11.0.2 pkgsrc-2013Q3-base:1.11 pkgsrc-2013Q2:1.10.0.16 pkgsrc-2013Q2-base:1.10 pkgsrc-2013Q1:1.10.0.14 pkgsrc-2013Q1-base:1.10 pkgsrc-2012Q4:1.10.0.12 pkgsrc-2012Q4-base:1.10 pkgsrc-2012Q3:1.10.0.10 pkgsrc-2012Q3-base:1.10 pkgsrc-2012Q2:1.10.0.8 pkgsrc-2012Q2-base:1.10 pkgsrc-2012Q1:1.10.0.6 pkgsrc-2012Q1-base:1.10 pkgsrc-2011Q4:1.10.0.4 pkgsrc-2011Q4-base:1.10 pkgsrc-2011Q3:1.10.0.2 pkgsrc-2011Q3-base:1.10 pkgsrc-2011Q2:1.9.0.12 pkgsrc-2011Q2-base:1.9 pkgsrc-2011Q1:1.9.0.10 pkgsrc-2011Q1-base:1.9 pkgsrc-2010Q4:1.9.0.8 pkgsrc-2010Q4-base:1.9 pkgsrc-2010Q3:1.9.0.6 pkgsrc-2010Q3-base:1.9 pkgsrc-2010Q2:1.9.0.4 pkgsrc-2010Q2-base:1.9 pkgsrc-2010Q1:1.9.0.2 pkgsrc-2010Q1-base:1.9 pkgsrc-2009Q4:1.8.0.30 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.28 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.8.0.26 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.8.0.24 pkgsrc-2009Q1-base:1.8 pkgsrc-2008Q4:1.8.0.22 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.20 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.18 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.16 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.14 pkgsrc-2008Q1:1.8.0.12 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.10 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.8 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.6 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.4 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.2 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.7.0.4 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.2 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.6.0.20 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.18 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.16 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.14 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.12 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.10 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.8 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.6 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.4 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 buildlink2-base:1.4; locks; strict; comment @# @; 1.11 date 2013.09.10.14.45.05; author joerg; state Exp; branches; next 1.10; commitid h4i6z78DVIEQWT4x; 1.10 date 2011.09.29.21.00.19; author wiz; state Exp; branches; next 1.9; 1.9 date 2010.03.04.14.56.13; author martin; state Exp; branches; next 1.8; 1.8 date 2006.11.10.10.07.20; author martin; state Exp; branches; next 1.7; 1.7 date 2006.06.02.09.52.31; author martin; state Exp; branches; next 1.6; 1.6 date 2003.08.11.07.39.29; author martin; state dead; branches; next 1.5; 1.5 date 2003.08.06.06.23.29; author wiz; state Exp; branches; next 1.4; 1.4 date 2001.02.20.15.15.09; author wiz; state dead; branches; next 1.3; 1.3 date 2001.02.20.13.00.37; author wiz; state Exp; branches; next 1.2; 1.2 date 2001.02.19.14.34.53; author simonb; state dead; branches; next 1.1; 1.1 date 2001.02.19.13.30.25; author simonb; state Exp; branches; next ; desc @@ 1.11 log @Use correct format strings for 64bit uvm structure layout. @ text @$NetBSD: patch-aa,v 1.10 2011/09/29 21:00:19 wiz Exp $ --- xuvmstat.c.orig 2005-09-09 13:38:48.000000000 +0000 +++ xuvmstat.c @@@@ -24,6 +24,7 @@@@ * xuvmstat.c */ +#include #include #include #include @@@@ -40,19 +41,19 @@@@ #include "libcdcx.h" -void get_uvmexp __P((struct uvmexp *)); +void get_uvmexp __P((struct uvmexp_sysctl *)); void redraw __P((struct xdpy *, Window, GC, int)); u_long black, white, red, green, blue, magenta, orange, purple; XFontStruct *fnt_fixed, *fnt_8x13bold; -struct uvmexp cexp, oexp; /* current, old */ +struct uvmexp_sysctl curexp, oexp; /* current, old */ struct timeval tv, otv; struct graph *gp_faults, *gp_traps, *gp_intrs, *gp_ctx; #define WIDTH 300 -main(argc, argv) +int main(argc, argv) int argc; char **argv; @@@@ -100,7 +101,7 @@@@ char **argv; XMapRaised(xdpy.dpy, win); XFlush(xdpy.dpy); - get_uvmexp(&cexp); + get_uvmexp(&curexp); gettimeofday(&tv, NULL); get_uvmexp(&oexp); gettimeofday(&otv, NULL); @@@@ -135,8 +136,8 @@@@ char **argv; if (retval == 0) { timeradd(&now, &incr, &ping); otv = tv; - oexp = cexp; - get_uvmexp(&cexp); + oexp = curexp; + get_uvmexp(&curexp); gettimeofday(&tv, NULL); /* NEW GRAPH DATA HERE */ @@@@ -185,8 +186,8 @@@@ int was_timeout; y += 5; XSetFont(xdpy->dpy, gc, fnt_fixed->fid); - snprintf(buf, sizeof(buf),"The UVM system manages %d %d-byte pages", - cexp.npages, cexp.pagesize); + snprintf(buf, sizeof(buf),"The UVM system manages %jd %jd-byte pages", + (intmax_t)curexp.npages, (intmax_t)curexp.pagesize); XDrawImageString(xdpy->dpy, win, gc, 5, get_fontheight(fnt_fixed) + y, buf, strlen(buf)); y += get_fontheight(fnt_fixed) + 5; @@@@ -205,12 +206,12 @@@@ int was_timeout; colors[4] = purple; } - vals[0] = cexp.active; - vals[1] = cexp.inactive; - vals[2] = cexp.free; - vals[3] = cexp.wired; - vals[4] = cexp.npages - (vals[0]+vals[1]+vals[2]+vals[3]); - y = draw_barbox(xdpy, win, gc, fnt_fixed, 5, 295, y, 5, cexp.npages, names, + vals[0] = curexp.active; + vals[1] = curexp.inactive; + vals[2] = curexp.free; + vals[3] = curexp.wired; + vals[4] = curexp.npages - (vals[0]+vals[1]+vals[2]+vals[3]); + y = draw_barbox(xdpy, win, gc, fnt_fixed, 5, 295, y, 5, curexp.npages, names, vals, colors, white); } @@@@ -229,12 +230,12 @@@@ int was_timeout; colors[4] = purple; } - vals[0] = cexp.filepages; - vals[1] = cexp.anonpages; - vals[2] = cexp.execpages; - vals[3] = cexp.free; - vals[4] = cexp.npages - (vals[0]+vals[1]+vals[2]+vals[3]); - y = draw_barbox(xdpy, win, gc, fnt_fixed, 5, 295, y, 5, cexp.npages, names, + vals[0] = curexp.filepages; + vals[1] = curexp.anonpages; + vals[2] = curexp.execpages; + vals[3] = curexp.free; + vals[4] = curexp.npages - (vals[0]+vals[1]+vals[2]+vals[3]); + y = draw_barbox(xdpy, win, gc, fnt_fixed, 5, 295, y, 5, curexp.npages, names, vals, colors, white); } @@@@ -245,11 +246,11 @@@@ int was_timeout; u_long vals[3]; u_long colors[3]; - vals[0] = cexp.freemin; colors[0] = black; - vals[1] = cexp.freetarg; colors[1] = black; - vals[2] = cexp.free; colors[2] = green; + vals[0] = curexp.freemin; colors[0] = black; + vals[1] = curexp.freetarg; colors[1] = black; + vals[2] = curexp.free; colors[2] = green; - y = draw_barlvl(xdpy, win, gc, fnt_fixed, 5, 295, y, 3, cexp.npages, names, + y = draw_barlvl(xdpy, win, gc, fnt_fixed, 5, 295, y, 3, curexp.npages, names, vals, colors, white); } @@@@ -260,10 +261,10 @@@@ int was_timeout; u_long vals[2]; u_long colors[2]; - vals[0] = cexp.inactarg; colors[0] = black; - vals[1] = cexp.inactive; colors[1] = blue; + vals[0] = curexp.inactarg; colors[0] = black; + vals[1] = curexp.inactive; colors[1] = blue; - y = draw_barlvl(xdpy, win, gc, fnt_fixed, 5, 295, y, 2, cexp.npages, names, + y = draw_barlvl(xdpy, win, gc, fnt_fixed, 5, 295, y, 2, curexp.npages, names, vals, colors, white); } @@@@ -274,10 +275,10 @@@@ int was_timeout; u_long vals[2]; u_long colors[2]; - vals[0] = cexp.wiredmax; colors[0] = black; - vals[1] = cexp.wired; colors[1] = orange; + vals[0] = curexp.wiredmax; colors[0] = black; + vals[1] = curexp.wired; colors[1] = orange; - y = draw_barlvl(xdpy, win, gc, fnt_fixed, 5, 295, y, 2, cexp.npages, names, + y = draw_barlvl(xdpy, win, gc, fnt_fixed, 5, 295, y, 2, curexp.npages, names, vals, colors, white); } @@@@ -289,15 +290,15 @@@@ int was_timeout; if (init == 0) { static char *names[] = { "faults", "anon", "ancow", "obj", "copy", "zero" }; - static int *before[6], *after[6]; + static int64_t *before[6], *after[6]; static u_long color[6]; init = 1; - before[0] = &oexp.faults; after[0] = &cexp.faults; color[0] = black; - before[1] = &oexp.flt_anon; after[1] = &cexp.flt_anon; color[1] = red; - before[2] = &oexp.flt_acow; after[2] = &cexp.flt_acow; color[2] = blue; - before[3] = &oexp.flt_obj; after[3] = &cexp.flt_obj; color[3] = green; - before[4] = &oexp.flt_prcopy; after[4] = &cexp.flt_prcopy; color[4] = orange; - before[5] = &oexp.flt_przero; after[5] = &cexp.flt_przero; color[5] = purple; + before[0] = &oexp.faults; after[0] = &curexp.faults; color[0] = black; + before[1] = &oexp.flt_anon; after[1] = &curexp.flt_anon; color[1] = red; + before[2] = &oexp.flt_acow; after[2] = &curexp.flt_acow; color[2] = blue; + before[3] = &oexp.flt_obj; after[3] = &curexp.flt_obj; color[3] = green; + before[4] = &oexp.flt_prcopy; after[4] = &curexp.flt_prcopy; color[4] = orange; + before[5] = &oexp.flt_przero; after[5] = &curexp.flt_przero; color[5] = purple; gp_faults = create_graph(6, "FAULTS", names, before, after, color, white); } @@@@ -311,10 +312,10 @@@@ int was_timeout; if (init == 0) { static char *names[] = { "traps" }; - static int *before[1], *after[1]; + static int64_t *before[1], *after[1]; static u_long color[1]; init = 1; - before[0] = &oexp.traps; after[0] = &cexp.traps; color[0] = black; + before[0] = &oexp.traps; after[0] = &curexp.traps; color[0] = black; gp_traps = create_graph(1, "TRAPS", names, before, after, color, white); } @@@@ -330,12 +331,12 @@@@ int was_timeout; if (init == 0) { static char *names[] = { "intrs", "soft", "syscall" }; - static int *before[3], *after[3]; + static int64_t *before[3], *after[3]; static u_long color[3]; init = 1; - before[0] = &oexp.intrs; after[0] = &cexp.intrs; color[0] = black; - before[1] = &oexp.softs; after[1] = &cexp.softs; color[1] = blue; - before[2] = &oexp.syscalls; after[2] = &cexp.syscalls; color[2] = red; + before[0] = &oexp.intrs; after[0] = &curexp.intrs; color[0] = black; + before[1] = &oexp.softs; after[1] = &curexp.softs; color[1] = blue; + before[2] = &oexp.syscalls; after[2] = &curexp.syscalls; color[2] = red; gp_intrs = create_graph(3, "INTRS", names, before, after, color, white); } @@@@ -349,12 +350,12 @@@@ int was_timeout; if (init == 0) { static char *names[] = { "cswtch", "swin", "swout" }; - static int *before[3], *after[3]; + static int64_t *before[3], *after[3]; static u_long color[3]; init = 1; - before[0] = &oexp.swtch; after[0] = &cexp.swtch; color[0] = black; - before[1] = &oexp.swapins; after[1] = &cexp.swapins; color[1] = green; - before[2] = &oexp.swapouts; after[2] = &cexp.swapouts; color[2] = red; + before[0] = &oexp.swtch; after[0] = &curexp.swtch; color[0] = black; + before[1] = &oexp.swapins; after[1] = &curexp.swapins; color[1] = green; + before[2] = &oexp.swapouts; after[2] = &curexp.swapouts; color[2] = red; gp_ctx = create_graph(3, "SWITCH/SWAP", names, before, after, color, white); } @@@@ -372,26 +373,31 @@@@ int was_timeout; buf, strlen(buf)); y += get_fontheight(fnt_fixed) + 5; +#if __NetBSD_Version__ >= 599002100 + snprintf(buf, sizeof(buf), " woke=%jd, revs=%jd", + (intmax_t)curexp.pdwoke, (intmax_t)curexp.pdrevs); +#else snprintf(buf, sizeof(buf), " woke=%d, revs=%d, swout=%d", - cexp.pdwoke, cexp.pdrevs, cexp.pdswout); + curexp.pdwoke, curexp.pdrevs, curexp.pdswout); +#endif XDrawImageString(xdpy->dpy, win, gc, 5, get_fontheight(fnt_fixed) + y, buf, strlen(buf)); y += get_fontheight(fnt_fixed) + 1; - snprintf(buf, sizeof(buf), " scans=%d, anon_scans=%d, obj_scans=%d", - cexp.pdscans, cexp.pdanscan, cexp.pdobscan); + snprintf(buf, sizeof(buf), " scans=%jd, anon_scans=%jd, obj_scans=%jd", + (intmax_t)curexp.pdscans, (intmax_t)curexp.pdanscan, (intmax_t)curexp.pdobscan); XDrawImageString(xdpy->dpy, win, gc, 5, get_fontheight(fnt_fixed) + y, buf, strlen(buf)); y += get_fontheight(fnt_fixed) + 1; - snprintf(buf, sizeof(buf), " busy=%d, freed=%d, pending=%d", - cexp.pdbusy, cexp.pdfreed, cexp.pdpending); + snprintf(buf, sizeof(buf), " busy=%jd, freed=%jd, pending=%jd", + (intmax_t)curexp.pdbusy, (intmax_t)curexp.pdfreed, (intmax_t)curexp.pdpending); XDrawImageString(xdpy->dpy, win, gc, 5, get_fontheight(fnt_fixed) + y, buf, strlen(buf)); y += get_fontheight(fnt_fixed) + 1; - snprintf(buf, sizeof(buf), " reactivate=%d, deactivate=%d, pageouts=%d", - cexp.pdreact, cexp.pddeact, cexp.pdpageouts); + snprintf(buf, sizeof(buf), " reactivate=%jd, deactivate=%jd, pageouts=%jd", + (intmax_t)curexp.pdreact, (intmax_t)curexp.pddeact, (intmax_t)curexp.pdpageouts); XDrawImageString(xdpy->dpy, win, gc, 5, get_fontheight(fnt_fixed) + y, buf, strlen(buf)); y += get_fontheight(fnt_fixed) + 1; @ 1.10 log @Fix build on NetBSD-current. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.9 2010/03/04 14:56:13 martin Exp $ d56 2 a57 1 @@@@ -186,7 +187,7 @@@@ int was_timeout; d60 1 a60 1 snprintf(buf, sizeof(buf),"The UVM system manages %d %d-byte pages", d62 2 a63 1 + curexp.npages, curexp.pagesize); d224 2 a225 2 + snprintf(buf, sizeof(buf), " woke=%d, revs=%d", + curexp.pdwoke, curexp.pdrevs); d235 1 a235 1 snprintf(buf, sizeof(buf), " scans=%d, anon_scans=%d, obj_scans=%d", d237 2 a238 1 + curexp.pdscans, curexp.pdanscan, curexp.pdobscan); d243 1 a243 1 snprintf(buf, sizeof(buf), " busy=%d, freed=%d, pending=%d", d245 2 a246 1 + curexp.pdbusy, curexp.pdfreed, curexp.pdpending); d251 1 a251 1 snprintf(buf, sizeof(buf), " reactivate=%d, deactivate=%d, pageouts=%d", d253 2 a254 1 + curexp.pdreact, curexp.pddeact, curexp.pdpageouts); @ 1.9 log @NetBSD 5.99.21 and newer does not swap out user areas @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 2006/11/10 10:07:20 martin Exp $ d3 11 a13 3 --- xuvmstat.c.orig 2005-09-09 15:38:48.000000000 +0200 +++ xuvmstat.c 2010-03-04 15:51:54.000000000 +0100 @@@@ -40,13 +40,13 @@@@ d29 8 a36 1 @@@@ -100,7 +100,7 @@@@ d45 1 a45 1 @@@@ -135,8 +135,8 @@@@ d56 1 a56 1 @@@@ -186,7 +186,7 @@@@ d65 1 a65 1 @@@@ -205,12 +205,12 @@@@ d84 1 a84 1 @@@@ -229,12 +229,12 @@@@ d103 1 a103 1 @@@@ -245,11 +245,11 @@@@ d119 1 a119 1 @@@@ -260,10 +260,10 @@@@ d133 1 a133 1 @@@@ -274,10 +274,10 @@@@ d147 1 a147 1 @@@@ -289,15 +289,15 @@@@ d170 1 a170 1 @@@@ -311,10 +311,10 @@@@ d183 1 a183 1 @@@@ -330,12 +330,12 @@@@ d200 1 a200 1 @@@@ -349,12 +349,12 @@@@ d217 1 a217 1 @@@@ -372,26 +372,31 @@@@ @ 1.8 log @Adapt to recent struct uvmexp changes. @ text @d1 1 a1 1 $NetBSD$ d4 1 a4 1 +++ xuvmstat.c 2006-11-10 10:52:11.000000000 +0100 d202 2 a203 1 @@@@ -373,25 +373,25 @@@@ d206 4 d213 1 @ 1.7 log @gcc 4.1 police @ text @d3 10 a12 3 --- xuvmstat.c.orig 2006-06-02 11:45:59.000000000 +0200 +++ xuvmstat.c 2006-06-02 11:46:59.000000000 +0200 @@@@ -46,7 +46,7 @@@@ void redraw __P((struct xdpy *, Window, d17 1 a17 1 +struct uvmexp curexp, oexp; /* current, old */ d21 1 a21 1 @@@@ -100,7 +100,7 @@@@ char **argv; d30 1 a30 1 @@@@ -135,8 +135,8 @@@@ char **argv; d41 1 a41 1 @@@@ -186,7 +186,7 @@@@ int was_timeout; d50 1 a50 1 @@@@ -205,12 +205,12 @@@@ int was_timeout; d69 1 a69 1 @@@@ -229,12 +229,12 @@@@ int was_timeout; d88 1 a88 1 @@@@ -245,11 +245,11 @@@@ int was_timeout; d104 1 a104 1 @@@@ -260,10 +260,10 @@@@ int was_timeout; d118 1 a118 1 @@@@ -274,10 +274,10 @@@@ int was_timeout; d132 6 a137 2 @@@@ -292,12 +292,12 @@@@ int was_timeout; static int *before[6], *after[6]; d155 6 a160 2 @@@@ -314,7 +314,7 @@@@ int was_timeout; static int *before[1], *after[1]; d168 6 a173 2 @@@@ -333,9 +333,9 @@@@ int was_timeout; static int *before[3], *after[3]; d185 6 a190 2 @@@@ -352,9 +352,9 @@@@ int was_timeout; static int *before[3], *after[3]; d202 1 a202 1 @@@@ -373,25 +373,25 @@@@ int was_timeout; @ 1.6 log @Update to xuvmstat-20030810 (fixes for gcc3.3). @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2003/08/06 06:23:29 wiz Exp $ d3 2 a4 2 --- xuvmstat.c.orig Tue Feb 20 15:40:49 2001 +++ xuvmstat.c d9 2 a10 2 -struct uvmexp exp, oexp; +static struct uvmexp exp, oexp; d14 195 @ 1.5 log @Declare exp static to make this compile with gcc-3.3.1. From Anders Hjalmarsson in PR 22370. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update to 20010220 -- <1.5 patch integrated. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2001/02/20 13:00:37 wiz Exp $ d3 1 a3 1 --- xuvmstat.c.orig Mon Feb 19 15:23:55 2001 d5 9 a13 10 @@@@ -31,6 +31,9 @@@@ #include #include #include +#if (__NetBSD_Version__ < 105000000) +#include +#endif #include #include #include @ 1.3 log @Fix compilation on < 1.5. Patch provided by Havard Eidnes. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Upgrade to version 20010219 - this new version incorporates the LP64 patches that were in the patches/ directory. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2001/02/19 13:30:25 simonb Exp $ d3 12 a14 12 --- get_uvmexp.c.orig Mon Feb 12 12:18:14 2001 +++ get_uvmexp.c Tue Feb 20 00:14:00 2001 @@@@ -31,7 +31,8 @@@@ struct uvmexp *uvmexp; { - int mib[2], len; + int mib[2]; + size_t len; mib[0] = CTL_VM; mib[1] = VM_UVMEXP; len = sizeof(*uvmexp); @ 1.1 log @LP64 fixes. @ text @d1 1 a1 1 $NetBSD$ @