Merge pull request #62041 from Ma27/fix-w3m-nox

w3m-nox: fix build
This commit is contained in:
Renaud 2019-05-26 00:54:54 +02:00 committed by GitHub
commit 6f19a3c131
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,14 +1,13 @@
Forget about X11 in fb module. Forget about X11 in fb module.
This breaks w3mimgdisplay under X11, but removes X11 dependency it in pure fb. This breaks w3mimgdisplay under X11, but removes X11 dependency it in pure fb.
diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c
index ea36637..d3d7bc3 100644 index 1a5151c..d3d7bc3 100644
--- a/w3mimg/fb/fb_imlib2.c --- a/w3mimg/fb/fb_imlib2.c
+++ b/w3mimg/fb/fb_imlib2.c +++ b/w3mimg/fb/fb_imlib2.c
@@ -3,7 +3,7 @@ @@ -3,6 +3,7 @@
fb_imlib2.c 0.3 Copyright (C) 2002, hito fb_imlib2.c 0.3 Copyright (C) 2002, hito
**************************************************************************/ **************************************************************************/
-#include <X11/Xlib.h>
+#define X_DISPLAY_MISSING +#define X_DISPLAY_MISSING
#include <Imlib2.h> #include <Imlib2.h>
#include "fb.h" #include "fb.h"