diff options
| author | Wang Zhenyu <[email protected]> | 2006-12-04 15:48:04 +0800 |
|---|---|---|
| committer | Keith Packard <[email protected]> | 2007-01-06 15:49:23 -0800 |
| commit | caf8010652f77e7687c0a3b7c267ba49d0a24d74 (patch) | |
| tree | b21776131775e7ec72e5ab57c962226eaa755030 /src/mesa/shader/arbprogparse.c | |
| parent | f34cad0f972ca838cb223429acab54d26c2f6a57 (diff) | |
| parent | 8c1cc5fd8084e7a927b15c88709a615fa16b06a3 (diff) | |
Merge branch 'master' into crestline
Conflicts:
src/mesa/drivers/dri/i965/brw_tex_layout.c
Michel Dänzer replaced the copy of the 945 mipmap layout code with that from
the 945 driver directly.
Diffstat (limited to 'src/mesa/shader/arbprogparse.c')
| -rw-r--r-- | src/mesa/shader/arbprogparse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c index 5a61f30193b..72d49093721 100644 --- a/src/mesa/shader/arbprogparse.c +++ b/src/mesa/shader/arbprogparse.c @@ -3703,7 +3703,7 @@ parse_instructions(GLcontext * ctx, const GLubyte * inst, /* XXX temporary */ -__extension__ static char core_grammar_text[] = +LONGSTRING static char core_grammar_text[] = #include "grammar_syn.h" ; |