diff options
| author | Christian König <[email protected]> | 2011-03-19 01:02:40 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-03-19 01:02:40 +0100 |
| commit | 2bf95c519e755146704f4942b1703d47d18bfeaa (patch) | |
| tree | 9d29c5d56014377013770615611f903cd5b25292 /src/glx/indirect.c | |
| parent | f36846c77ee196881c0da560229279fc7ed88170 (diff) | |
| parent | 8042d751debb7a8375e8bc587189fea9a5a8371d (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_asm.c
src/gallium/tests/unit/SConscript
Diffstat (limited to 'src/glx/indirect.c')
| -rw-r--r-- | src/glx/indirect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glx/indirect.c b/src/glx/indirect.c index f79175b760d..b2675c2958f 100644 --- a/src/glx/indirect.c +++ b/src/glx/indirect.c @@ -10717,5 +10717,5 @@ __indirect_get_proc_address(const char *name) #endif /* GLX_SHARED_GLAPI */ -#undef FASTCALL -#undef NOINLINE +# undef FASTCALL +# undef NOINLINE |