diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
| commit | b7f01cb1f6cfd1ec301f650a073436c91ec614aa (patch) | |
| tree | 1dbf32344313ad7e5884e6686251cad398a231fa /xorg-server/mi/migc.h | |
| parent | 7b4b94b4449aec056c4c92f5cacc2f89a292a80e (diff) | |
| parent | 1b0fcca503ae9cf2d462b60770f96c794dfbb27a (diff) | |
| download | vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.gz vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.bz2 vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkeyboard-config xserver git update 15 jan 2014
randrproto libfontenc mesa xserver git update 10 Jan 2014
randsrproto fontconfig libX11 git update 6 Jan 2014
Conflicts:
mesalib/src/glsl/builtin_functions.cpp
mesalib/src/glsl/ir_builder.h
xorg-server/Xext/xres.c
xorg-server/dix/dispatch.c
xorg-server/dix/dixfonts.c
xorg-server/hw/xwin/wingc.c
xorg-server/hw/xwin/winwindowswm.c
xorg-server/include/gc.h
xorg-server/os/access.c
Diffstat (limited to 'xorg-server/mi/migc.h')
| -rw-r--r-- | xorg-server/mi/migc.h | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/xorg-server/mi/migc.h b/xorg-server/mi/migc.h index 8c13b2e53..8d06a6f9f 100644 --- a/xorg-server/mi/migc.h +++ b/xorg-server/mi/migc.h @@ -26,31 +26,24 @@ from The Open Group. */ -extern _X_EXPORT void miChangeGC(GCPtr /*pGC */ , - unsigned long /*mask */ - ); - -extern _X_EXPORT void miDestroyGC(GCPtr /*pGC */ - ); - -extern _X_EXPORT void miDestroyClip(GCPtr /*pGC */ - ); - -extern _X_EXPORT void miChangeClip(GCPtr /*pGC */ , - int /*type */ , - pointer /*pvalue */ , - int /*nrects */ - ); - -extern _X_EXPORT void miCopyClip(GCPtr /*pgcDst */ , - GCPtr /*pgcSrc */ - ); - -extern _X_EXPORT void miCopyGC(GCPtr /*pGCSrc */ , - unsigned long /*changes */ , - GCPtr /*pGCDst */ - ); - -extern _X_EXPORT void miComputeCompositeClip(GCPtr /*pGC */ , - DrawablePtr /*pDrawable */ - ); +extern _X_EXPORT void miChangeGC(GCPtr pGC, + unsigned long mask); + +extern _X_EXPORT void miDestroyGC(GCPtr pGC); + +extern _X_EXPORT void miDestroyClip(GCPtr pGC); + +extern _X_EXPORT void miChangeClip(GCPtr pGC, + int type, + void *pvalue, + int nrects); + +extern _X_EXPORT void miCopyClip(GCPtr pgcDst, + GCPtr pgcSrc); + +extern _X_EXPORT void miCopyGC(GCPtr pGCSrc, + unsigned long changes, + GCPtr pGCDst); + +extern _X_EXPORT void miComputeCompositeClip(GCPtr pGC, + DrawablePtr pDrawable); |