summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/lines.h
diff options
context:
space:
mode:
authorChristian König <[email protected]>2010-10-28 20:24:56 +0200
committerChristian König <[email protected]>2010-10-28 20:24:56 +0200
commit41ed47d6b8fb6c032e2907ef2e49e414c26f35c1 (patch)
tree8cf267ee3ac5d8b530dd70a28a0d568344aa8304 /src/mesa/main/lines.h
parent97a7cf230a70c64fff300931ae7c00aa00449c97 (diff)
parent5479fa34d9acebd55f68c23a278cf382d0e84248 (diff)
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video
Conflicts: src/gallium/include/pipe/p_format.h
Diffstat (limited to 'src/mesa/main/lines.h')
-rw-r--r--src/mesa/main/lines.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/lines.h b/src/mesa/main/lines.h
index 5a47e9858d5..3accdd78004 100644
--- a/src/mesa/main/lines.h
+++ b/src/mesa/main/lines.h
@@ -43,6 +43,6 @@ extern void GLAPIENTRY
_mesa_LineStipple( GLint factor, GLushort pattern );
extern void GLAPIENTRY
-_mesa_init_line( GLcontext * ctx );
+_mesa_init_line( struct gl_context * ctx );
#endif