diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-19 22:15:01 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-19 22:15:01 +0200 |
| commit | 70ac75f4ab184c21d11b9840a47362610aaef481 (patch) | |
| tree | 183b9ec7e6897fb2cea7296b461a35ca93dfce6e /nx-X11/lib/X11/Xcms.h | |
| parent | 6c303d9e4ffd162b8c7f59a4b135e592d923a656 (diff) | |
| parent | 70e9d346fe34af127d2c827c3678e53d0f4312ae (diff) | |
| download | nx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.tar.gz nx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.tar.bz2 nx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.zip | |
Merge branch 'uli42-pr/libX11_further_backports' into 3.6.x
Attributes GH PR #222: https://github.com/ArcticaProject/nx-libs/pull/222
Diffstat (limited to 'nx-X11/lib/X11/Xcms.h')
| -rw-r--r-- | nx-X11/lib/X11/Xcms.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/nx-X11/lib/X11/Xcms.h b/nx-X11/lib/X11/Xcms.h index 7f7c1553a..3b0410533 100644 --- a/nx-X11/lib/X11/Xcms.h +++ b/nx-X11/lib/X11/Xcms.h @@ -32,6 +32,14 @@ #include <nx-X11/Xlib.h> +/* The Xcms 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 + /* * XCMS Status Values */ @@ -799,6 +807,10 @@ extern Visual *XcmsVisualOfCCC ( XcmsCCC /* ccc */ ); +#ifdef __clang__ +#pragma clang diagnostic pop +#endif + _XFUNCPROTOEND #endif /* !defined(_X11_XCMS_H_) && !defined(_XCMS_H_) */ |