diff options
| author | Ben Skeggs <[email protected]> | 2008-06-23 00:01:17 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-06-23 00:01:17 +1000 |
| commit | aa3ab377e6e2e5811cdd704d87c3e24acb5eff72 (patch) | |
| tree | ab8a443a58a58a6b88f35d4b5730ed1292e44d26 /src/mesa/glapi/glapitable.h | |
| parent | 8c26a521ee80f5d8a1d0aabd0910233aad400322 (diff) | |
| parent | e2c3f06e9649b5b87fc9adbca7d1f07841bba895 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Conflicts:
configs/default
Diffstat (limited to 'src/mesa/glapi/glapitable.h')
| -rw-r--r-- | src/mesa/glapi/glapitable.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h index 48941f5590e..5d9d40a8a25 100644 --- a/src/mesa/glapi/glapitable.h +++ b/src/mesa/glapi/glapitable.h @@ -37,7 +37,6 @@ # define GLAPIENTRYP GLAPIENTRY * #endif -typedef void (*_glapi_proc)(void); /* generic function pointer */ struct _glapi_table { |