diff options
| author | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-26 12:49:41 +0200 |
|---|---|---|
| committer | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-26 12:49:41 +0200 |
| commit | dbf3a15313eed930a3d8fdde12e457259c43651b (patch) | |
| tree | 78bc54fa866ff1e97e61802f52dabe3f4f3380b1 /src/mesa/drivers/windows/gldirect/dglcontext.c | |
| parent | 1dccc4cfaa423f15ab582d2a0253a84a0ae0b9fa (diff) | |
| parent | 547e7619aac74ae13bdaa7fdf403a4ceb5212467 (diff) | |
Merge branch 'master' into pipe-video
Conflicts:
src/gallium/include/pipe/p_format.h
Diffstat (limited to 'src/mesa/drivers/windows/gldirect/dglcontext.c')
| -rw-r--r-- | src/mesa/drivers/windows/gldirect/dglcontext.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/windows/gldirect/dglcontext.c b/src/mesa/drivers/windows/gldirect/dglcontext.c index a420b36ffb4..10ea0578506 100644 --- a/src/mesa/drivers/windows/gldirect/dglcontext.c +++ b/src/mesa/drivers/windows/gldirect/dglcontext.c @@ -42,8 +42,8 @@ #ifdef _USE_GLD3_WGL #include "gld_driver.h" -extern void _gld_mesa_warning(GLcontext *, char *); -extern void _gld_mesa_fatal(GLcontext *, char *); +extern void _gld_mesa_warning(struct gl_context *, char *); +extern void _gld_mesa_fatal(struct gl_context *, char *); #endif // _USE_GLD3_WGL // TODO: Clean out old DX6-specific code from GLD 2.x CAD driver |