diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
| commit | c67a0f76ca34e441a817a7cdf261f496f3b3f2d6 (patch) | |
| tree | c197b74a8c2f076aaa4f5506b90d6ad8e38b52b2 /libX11/include/X11/Xlib.h | |
| parent | 8d07c58314685d56a0586d0a437b541ea2b92a54 (diff) | |
| parent | 2a1abdc8fe640583dac90dc316caf2d40b9ee4e2 (diff) | |
| download | vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.gz vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.bz2 vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscale xkeyboard-config git update 14 jan 2013
Conflicts:
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'libX11/include/X11/Xlib.h')
| -rw-r--r-- | libX11/include/X11/Xlib.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libX11/include/X11/Xlib.h b/libX11/include/X11/Xlib.h index 3a73d7b83..112b85a94 100644 --- a/libX11/include/X11/Xlib.h +++ b/libX11/include/X11/Xlib.h @@ -81,6 +81,14 @@ _Xmblen( November 2000. Its presence is indicated through the following macro. */ #define X_HAVE_UTF8_STRING 1 +/* The Xlib structs are full of implicit padding to properly align members. + We can't clean that up without breaking ABI, so tell clang not to bother + complaining about it. */ +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wpadded" +#endif + typedef char *XPointer; typedef int Bool; @@ -4019,6 +4027,10 @@ extern void XFreeEventData( XGenericEventCookie* /* cookie*/ ); +#ifdef __clang__ +#pragma clang diagnostic pop +#endif + _XFUNCPROTOEND #endif /* _X11_XLIB_H_ */ |