diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 10:16:00 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 10:16:00 +0200 |
| commit | d14cc5361f7db7016b7cbb1cc59d8500101d9f27 (patch) | |
| tree | 28bb620b5a39a9f649393e5ad113b07089fafe2b /doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_Xrender_Xrender.h.X.original | |
| parent | 74a52dd354cc638c9f5fdedb0606b3b69e2b488a (diff) | |
| download | nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.tar.gz nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.tar.bz2 nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.zip | |
doc/_attic_/: Introduce an "_attic_" folder. Move diffs between NoMachine's nx-X11 3.5 and X.org 6.9 here.
Diffstat (limited to 'doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_Xrender_Xrender.h.X.original')
| -rw-r--r-- | doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_Xrender_Xrender.h.X.original | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_Xrender_Xrender.h.X.original b/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_Xrender_Xrender.h.X.original deleted file mode 100644 index 8bda13795..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_Xrender_Xrender.h.X.original +++ /dev/null @@ -1,39 +0,0 @@ ---- ./nx-X11/lib/Xrender/Xrender.h.X.original 2015-02-13 14:03:44.652443320 +0100 -+++ ./nx-X11/lib/Xrender/Xrender.h 2015-02-10 19:13:12.596731149 +0100 -@@ -25,6 +25,8 @@ - #ifndef _XRENDER_H_ - #define _XRENDER_H_ - -+#define NX_CLEANUP -+ - #include <X11/extensions/render.h> - - #include <X11/Xlib.h> -@@ -32,6 +34,10 @@ - #include <X11/Xosdefs.h> - #include <X11/Xutil.h> - -+#ifdef NX_CLEANUP -+#include "renderproto.h" -+#endif -+ - typedef struct { - short red; - short redMask; -@@ -296,6 +302,16 @@ - void - XRenderFreeGlyphSet (Display *dpy, GlyphSet glyphset); - -+#ifdef NX_CLEANUP -+ -+void XRenderCleanGlyphs (xGlyphInfo *gi, -+ int nglyphs, -+ CARD8 *images, -+ int depth, -+ Display *dpy); -+ -+#endif /* #ifdef NX_CLEANUP */ -+ - void - XRenderAddGlyphs (Display *dpy, - GlyphSet glyphset, |