diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-05 21:41:05 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-05 21:41:05 +0100 |
| commit | cf24c658a41b1a5a540506b62ba95fb3cc8a9737 (patch) | |
| tree | 612691d310a69cf67e873e02e77a35f9699aee1b /nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h | |
| parent | 475961e651e69b92a25709d99c6c9743a23acd55 (diff) | |
| parent | 3cd622cf4085e8c4257ff17c2481d92d3bc443f9 (diff) | |
| download | nx-libs-cf24c658a41b1a5a540506b62ba95fb3cc8a9737.tar.gz nx-libs-cf24c658a41b1a5a540506b62ba95fb3cc8a9737.tar.bz2 nx-libs-cf24c658a41b1a5a540506b62ba95fb3cc8a9737.zip | |
Merge branch 'uli42-pr/drop_icon_file_support' into 3.6.x
Attributes GH PR #888: https://github.com/ArcticaProject/nx-libs/pull/888
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h b/nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h index b02e5a913..ec72da07e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h +++ b/nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h @@ -238,21 +238,13 @@ typedef struct { _XFUNCPROTOBEGIN -/* Keep for hw/nxagent/Holder.c */ +/* Keep for hw/nxagent/Display.c */ FUNC(XpmCreatePixmapFromData, int, (Display *display, Drawable d, char **data, Pixmap *pixmap_return, Pixmap *shapemask_return, XpmAttributes *attributes)); -/* Keep for hw/nxagent/Display.c */ -FUNC(XpmReadFileToPixmap, int, (Display *display, - Drawable d, - const char *filename, - Pixmap *pixmap_return, - Pixmap *shapemask_return, - XpmAttributes *attributes)); - _XFUNCPROTOEND #endif /* XPM_NUMBERS */ |