frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation with windows.h from latest w32api 

misc.h has complex logic (checking MAXSHORT is undefined etc.)
controlling if it includes assert.h or not.

Including windows.h from w32api 9.0.0 now trips over that, causing
assert.h to not be included, causing various errors, e.g.

In file included from ../include/cursor.h:53,
                 from ../include/dix.h:54,
                 from ../os/osdep.h:139,
                 from ../hw/xwin/winauth.c:40:
../include/privates.h: In function ‘dixGetPrivateAddr’:
../include/privates.h:121:5: error: implicit declaration of function ‘assert’ [-Werror=implicit-function-declaration]

Fix this by IWYU in privates.h
This commit is contained in:
Jon Turney 2021-07-10 17:38:01 +01:00
parent ab86be0ed9
commit d68b50ec03
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/privates.h
View File

@ -15,6 +15,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <X11/Xdefs.h> #include <X11/Xdefs.h>
#include <X11/Xosdefs.h> #include <X11/Xosdefs.h>
#include <X11/Xfuncproto.h> #include <X11/Xfuncproto.h>
#include <assert.h>
#include "misc.h" #include "misc.h"
/***************************************************************** /*****************************************************************