diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-07 10:32:28 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-07 10:32:28 +0200 |
| commit | dcdbc102c1d1827fd10959148d52f9e2e96bf3cd (patch) | |
| tree | ad80fa3280e59a4787e3aa2a879ced0b0d8993a6 /nx-X11/programs/Xserver/render | |
| parent | c8a4e1e75c745c5c3ad947ba61c52cc5963d31dd (diff) | |
| parent | 6c8c950258cf0da0cf24c5e80c2216914ac282a4 (diff) | |
| download | nx-libs-dcdbc102c1d1827fd10959148d52f9e2e96bf3cd.tar.gz nx-libs-dcdbc102c1d1827fd10959148d52f9e2e96bf3cd.tar.bz2 nx-libs-dcdbc102c1d1827fd10959148d52f9e2e96bf3cd.zip | |
Merge branch 'sunweaver-pr/drop-render-fullcolor-workaround' into 3.6.x
Attributes GH PR #401: https://github.com/ArcticaProject/nx-libs/pull/401
Reviewed by: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> -- Fri, 07 Apr 2017 10:24:05 +0200
Diffstat (limited to 'nx-X11/programs/Xserver/render')
| -rw-r--r-- | nx-X11/programs/Xserver/render/picturestr.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/render/picturestr.h b/nx-X11/programs/Xserver/render/picturestr.h index 27c36dc9c..4969f6cab 100644 --- a/nx-X11/programs/Xserver/render/picturestr.h +++ b/nx-X11/programs/Xserver/render/picturestr.h @@ -65,14 +65,10 @@ typedef struct pixman_transform PictTransform, *PictTransformPtr; #define SourcePictTypeRadial 2 #define SourcePictTypeConical 3 -#ifdef NXAGENT_SERVER -#include "../hw/nxagent/NXpicturestr_PictSolidFill.h" -#else typedef struct _PictSolidFill { unsigned int type; CARD32 color; } PictSolidFill, *PictSolidFillPtr; -#endif /* NXAGENT_SERVER */ typedef struct _PictGradientStop { xFixed x; |