diff options
| author | Keith Whitwell <[email protected]> | 2009-12-01 10:57:37 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2009-12-01 10:57:37 +0000 |
| commit | 06d3732a9094030fc33120f16f162e0d405f132c (patch) | |
| tree | 185159951093f49f1877e78eaf01f6d1ea01e560 /scons | |
| parent | 853d4807fe220b17cf5af5a76b24f2466238013b (diff) | |
| parent | f17dbe256bb38c35d885260be7e5856f1561de97 (diff) | |
Merge commit 'origin/mesa_7_7_branch'
Conflicts:
src/gallium/drivers/svga/svga_screen_texture.c
src/gallium/state_trackers/xorg/xorg_composite.c
src/gallium/state_trackers/xorg/xorg_exa.c
src/gallium/state_trackers/xorg/xorg_renderer.c
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/main/texgetimage.c
src/mesa/main/version.h
Diffstat (limited to 'scons')
| -rw-r--r-- | scons/gallium.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scons/gallium.py b/scons/gallium.py index 483bd5d29eb..ca1ca5153e7 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -366,7 +366,7 @@ def generate(env): ccflags += [ '-Wall', '-Wmissing-field-initializers', - '-Wpointer-arith', + '-Werror=pointer-arith', '-Wno-long-long', '-ffast-math', '-fmessage-length=0', # be nice to Eclipse |