aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/render/picturestr.h
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-04-21 12:07:37 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-04-21 12:17:06 +0200
commit61d5cd0b75acc0ca3bfe2b6addc052c4aae8e6f2 (patch)
treeb9cd23a2b71f8461a7492b28c6cd8d91c9c7d07d /nx-X11/programs/Xserver/render/picturestr.h
parentf3d406109310404f14c9f489e89e70dfe8ed1119 (diff)
downloadnx-libs-61d5cd0b75acc0ca3bfe2b6addc052c4aae8e6f2.tar.gz
nx-libs-61d5cd0b75acc0ca3bfe2b6addc052c4aae8e6f2.tar.bz2
nx-libs-61d5cd0b75acc0ca3bfe2b6addc052c4aae8e6f2.zip
Revert "NXpicturestr_PictSolidFill.h: Drop file and revert db8705. Not an issue anymore nowadays."
This reverts commit 6c8c950258cf0da0cf24c5e80c2216914ac282a4. Fixes ArcticaProject/nx-libs#433. This patch is still a candidate for being re-implemented without extending the _PictSolidFill struct, but for now, we'll have to re-introduce commit db8705 for the sake of having fonts readable after resumption of remote NX sessions.
Diffstat (limited to 'nx-X11/programs/Xserver/render/picturestr.h')
-rw-r--r--nx-X11/programs/Xserver/render/picturestr.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/render/picturestr.h b/nx-X11/programs/Xserver/render/picturestr.h
index 7ce831c4b..f5c367bb4 100644
--- a/nx-X11/programs/Xserver/render/picturestr.h
+++ b/nx-X11/programs/Xserver/render/picturestr.h
@@ -65,10 +65,14 @@ 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;