aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-05-03 19:42:46 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-05-13 05:30:03 +0200
commit52dc49607e244c0e39b5d7cbdb8b41755f078aac (patch)
tree8c4e2be57984a1d9e6143944d080e19f6c3049ec /nx-X11
parenta0e5589edf49f6f43631ce4ee7458e2dce4994e5 (diff)
downloadnx-libs-52dc49607e244c0e39b5d7cbdb8b41755f078aac.tar.gz
nx-libs-52dc49607e244c0e39b5d7cbdb8b41755f078aac.tar.bz2
nx-libs-52dc49607e244c0e39b5d7cbdb8b41755f078aac.zip
hw/nxagent/Display.c: Avoid incompatible pointer type.
Amends the following compiler warning Display.c: In function ‘nxagentMakeIcon’: Display.c:1949:18: warning: assignment from incompatible pointer type agentIconData=x2goagentIconData; ^ Display.c:1954:18: warning: assignment from incompatible pointer type agentIconData=nxagentIconData; ^ Display.c:2001:41: warning: passing argument 3 of ‘XpmCreatePixmapFromData’ from incompatible pointer type agentIconData, ^ In file included from Icons.h:22:0, from Display.c:67: X11/include/xpm_nxagent.h:242:6: note: expected ‘char **’ but argument is of type ‘char *’ FUNC(XpmCreatePixmapFromData, int, (Display *display, ^ X11/include/xpm_nxagent.h:230:32: note: in definition of macro ‘FUNC’ #define FUNC(f, t, p) extern t f p
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index 960b8a1ad..628c4c495 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -1938,7 +1938,7 @@ Bool nxagentMakeIcon(Display *display, Pixmap *nxIcon, Pixmap *nxMask)
XlibPixmap IconPixmap;
XlibPixmap IconShape;
char* agent_icon_name;
- char* agentIconData;
+ char** agentIconData;
/*
* selecting x2go icon when running as X2Go agent