Commit 878040bf authored by Alan Coopersmith's avatar Alan Coopersmith Committed by Ulrich Sibiller

Tell clang not to report -Wpadded warnings on public headers we can't fix

Better to silence the compiler warning than break ABI. Signed-off-by: 's avatarAlan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: 's avatarUlrich Sibiller <uli42@gmx.de>
parent 9b5f99c3
...@@ -32,6 +32,14 @@ ...@@ -32,6 +32,14 @@
#include <nx-X11/Xlib.h> #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 * XCMS Status Values
*/ */
...@@ -799,6 +807,10 @@ extern Visual *XcmsVisualOfCCC ( ...@@ -799,6 +807,10 @@ extern Visual *XcmsVisualOfCCC (
XcmsCCC /* ccc */ XcmsCCC /* ccc */
); );
#ifdef __clang__
#pragma clang diagnostic pop
#endif
_XFUNCPROTOEND _XFUNCPROTOEND
#endif /* !defined(_X11_XCMS_H_) && !defined(_XCMS_H_) */ #endif /* !defined(_X11_XCMS_H_) && !defined(_XCMS_H_) */
...@@ -82,6 +82,14 @@ _Xmblen( ...@@ -82,6 +82,14 @@ _Xmblen(
November 2000. Its presence is indicated through the following macro. */ November 2000. Its presence is indicated through the following macro. */
#define X_HAVE_UTF8_STRING 1 #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 char *XPointer;
#define Bool int #define Bool int
...@@ -4037,6 +4045,10 @@ extern void XFreeEventData( ...@@ -4037,6 +4045,10 @@ extern void XFreeEventData(
XGenericEventCookie* /* cookie*/ XGenericEventCookie* /* cookie*/
); );
#ifdef __clang__
#pragma clang diagnostic pop
#endif
_XFUNCPROTOEND _XFUNCPROTOEND
#endif /* #if !defined(_X11_XLIB_H_) && !defined(_XLIB_H_) */ #endif /* #if !defined(_X11_XLIB_H_) && !defined(_XLIB_H_) */
...@@ -67,6 +67,14 @@ from The Open Group. ...@@ -67,6 +67,14 @@ from The Open Group.
#include <nx-X11/Xproto.h> /* to declare xEvent */ #include <nx-X11/Xproto.h> /* to declare xEvent */
#include <nx-X11/XlibConf.h> /* for configured options like XTHREADS */ #include <nx-X11/XlibConf.h> /* for configured options like XTHREADS */
/* 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
#ifdef NX_TRANS_SOCKET #ifdef NX_TRANS_SOCKET
#include <nx/NXvars.h> #include <nx/NXvars.h>
...@@ -1386,6 +1394,10 @@ extern void xlocaledir( ...@@ -1386,6 +1394,10 @@ extern void xlocaledir(
int buf_len int buf_len
); );
#ifdef __clang__
#pragma clang diagnostic pop
#endif
_XFUNCPROTOEND _XFUNCPROTOEND
#endif /* !defined(_X11_XLIBINT_H_) && !defined(_XLIBINT_H_) */ #endif /* !defined(_X11_XLIBINT_H_) && !defined(_XLIBINT_H_) */
...@@ -54,6 +54,14 @@ SOFTWARE. ...@@ -54,6 +54,14 @@ SOFTWARE.
#include <nx-X11/Xlib.h> #include <nx-X11/Xlib.h>
#include <nx-X11/keysym.h> #include <nx-X11/keysym.h>
/* 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
/* /*
* Bitmask returned by XParseGeometry(). Each bit tells if the corresponding * Bitmask returned by XParseGeometry(). Each bit tells if the corresponding
* value (x, y, width, height) was found in the parsed string. * value (x, y, width, height) was found in the parsed string.
...@@ -822,6 +830,10 @@ extern int XXorRegion( ...@@ -822,6 +830,10 @@ extern int XXorRegion(
Region /* dr_return */ Region /* dr_return */
); );
#ifdef __clang__
#pragma clang diagnostic pop
#endif
_XFUNCPROTOEND _XFUNCPROTOEND
#endif /* !defined(_X11_XUTIL_H_) && !defined(_XUTIL_H_) */ #endif /* !defined(_X11_XUTIL_H_) && !defined(_XUTIL_H_) */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment