diff options
| author | Christian König <[email protected]> | 2011-07-04 15:04:41 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-07-04 15:04:41 +0200 |
| commit | c3b2230b71cb3a00a7f4c0987197d397bada650b (patch) | |
| tree | 018f5df0f8b5976ddb56ef4f13e9466587838998 /src/glw/GLwDrawA.h | |
| parent | 003401f95c9b59471c22368b7da16fe7a951e490 (diff) | |
| parent | 424b1210d951c206e7c2fb8f2778acbd384eb247 (diff) | |
Merge remote-tracking branch 'origin/master' into pipe-video
Conflicts:
configure.ac
src/gallium/drivers/r600/r600_state_inlines.h
src/gallium/tests/trivial/Makefile
src/gallium/winsys/g3dvl/dri/XF86dri.c
src/gallium/winsys/g3dvl/dri/driclient.c
src/gallium/winsys/g3dvl/dri/driclient.h
src/gallium/winsys/g3dvl/dri/xf86dri.h
src/gallium/winsys/g3dvl/dri/xf86dristr.h
src/gallium/winsys/r600/drm/r600_bo.c
Diffstat (limited to 'src/glw/GLwDrawA.h')
| -rw-r--r-- | src/glw/GLwDrawA.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glw/GLwDrawA.h b/src/glw/GLwDrawA.h index cd631b4fb57..b9711c216bc 100644 --- a/src/glw/GLwDrawA.h +++ b/src/glw/GLwDrawA.h @@ -136,7 +136,7 @@ typedef struct _GLwMDrawingAreaClassRec *GLwMDrawingAreaWidgetClass; typedef struct _GLwMDrawingAreaRec *GLwMDrawingAreaWidget; -extern WidgetClass glwMDrawingAreaWidgetClass; +GLAPI WidgetClass glwMDrawingAreaWidgetClass; #else @@ -144,7 +144,7 @@ extern WidgetClass glwMDrawingAreaWidgetClass; typedef struct _GLwDrawingAreaClassRec *GLwDrawingAreaWidgetClass; typedef struct _GLwDrawingAreaRec *GLwDrawingAreaWidget; -extern WidgetClass glwDrawingAreaWidgetClass; +GLAPI WidgetClass glwDrawingAreaWidgetClass; #endif @@ -177,8 +177,8 @@ extern "C" { #endif /* front ends to glXMakeCurrent and glXSwapBuffers */ -extern void GLwDrawingAreaMakeCurrent(Widget w,GLXContext ctx); -extern void GLwDrawingAreaSwapBuffers(Widget w); +GLAPI void GLwDrawingAreaMakeCurrent(Widget w,GLXContext ctx); +GLAPI void GLwDrawingAreaSwapBuffers(Widget w); #ifdef __GLX_MOTIF #ifdef _NO_PROTO |