diff options
| author | Jakob Bornecrantz <[email protected]> | 2010-01-14 22:31:04 +0000 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2010-01-14 22:31:04 +0000 |
| commit | b01ffb12ed82dcf435b186e2aff35e344a8a6ebe (patch) | |
| tree | a62ee3f8f402f0c34ac88b5011da41a9cab8c6e3 /progs/xdemos | |
| parent | ffd28480560caecfb676a4bbe85a85672271e3f7 (diff) | |
| parent | 252812bf15c3479d921157b9a432c7e42d3b9446 (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/auxiliary/util/Makefile
src/gallium/drivers/r300/r300_state_derived.c
Diffstat (limited to 'progs/xdemos')
| -rw-r--r-- | progs/xdemos/corender.c | 1 | ||||
| -rw-r--r-- | progs/xdemos/manywin.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/progs/xdemos/corender.c b/progs/xdemos/corender.c index 640c902c136..e706f4b3da5 100644 --- a/progs/xdemos/corender.c +++ b/progs/xdemos/corender.c @@ -20,7 +20,6 @@ #include <math.h> #include <stdio.h> #include <stdlib.h> -#include <string.h> #include <X11/keysym.h> #include <unistd.h> #include "ipc.h" diff --git a/progs/xdemos/manywin.c b/progs/xdemos/manywin.c index 3b0810b2e54..8ad5c4fe49f 100644 --- a/progs/xdemos/manywin.c +++ b/progs/xdemos/manywin.c @@ -400,6 +400,8 @@ main(int argc, char *argv[]) } if (n < 1) n = 1; + if (n > MAX_HEADS) + n = MAX_HEADS; printf("%d windows\n", n); for (i = 0; i < n; i++) { |