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

hw/nxagent/Display.c: Avoid incompatible pointer type.
52dc4960 · Mike Gabriel · a0e5589e · 52dc4960
Commit 52dc4960 authored May 03, 2016 by Mike Gabriel
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Display.c nx-X11/programs/Xserver/hw/nxagent/Display.c +1 -1

No files found.
--- 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