diff options
| author | Pierre Ossman <ossman@cendio.se> | 2016-05-13 16:11:34 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2016-05-13 16:11:34 +0200 |
| commit | b7afc386fb67150d212ffd995d31ee0e4016fdee (patch) | |
| tree | 49ac7f013467a874fa44b01e588fd3b17519224b | |
| parent | 3157ed900c2f1b57b96e2dc01fa19744120fd3a3 (diff) | |
| download | tigervnc-b7afc386fb67150d212ffd995d31ee0e4016fdee.tar.gz tigervnc-b7afc386fb67150d212ffd995d31ee0e4016fdee.zip | |
Avoid symbol clash for Xregion functions
We might be linking our Xregion and libX11 into the same binary,
causing a clash between the symbols. In theory they should be
compatible, but that's not guaranteed. Avoid the issue by adding
a "vnc" prefix to our version.
| -rw-r--r-- | common/Xregion/Xutil.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/common/Xregion/Xutil.h b/common/Xregion/Xutil.h index f1d333ef..4da56a52 100644 --- a/common/Xregion/Xutil.h +++ b/common/Xregion/Xutil.h @@ -52,6 +52,22 @@ SOFTWARE. /* You must include <X11/Xlib.h> before including this file */ #include "Xlib.h" +/****** Avoid symbol clash with "real" libX11 ******/ +#define XClipBox vncXClipBox +#define XCreateRegion vncXCreateRegion +#define XDestroyRegion vncXDestroyRegion +#define XEmptyRegion vncXEmptyRegion +#define XEqualRegion vncXEqualRegion +#define XIntersectRegion vncXIntersectRegion +#define XOffsetRegion vncXOffsetRegion +#define XPointInRegion vncXPointInRegion +#define XPolygonRegion vncXPolygonRegion +#define XRectInRegion vncXRectInRegion +#define XShrinkRegion vncXShrinkRegion +#define XSubtractRegion vncXSubtractRegion +#define XUnionRectWithRegion vncXUnionRectWithRegion +#define XUnionRegion vncXUnionRegion +#define XXorRegion vncXXorRegion /* * opaque reference to Region data type |