summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-09-21 17:57:40 +0000
committerEgbert Eich <eich@suse.de>2004-09-21 17:57:40 +0000
commit98e553431586c07fe0534c01c0a6e1b15ddc8958 (patch)
treee6feabab017f9e785e0503cdfa777aaa9e5df5b6
parent3981cffbb6f4f4fe4227481c51083063a9ea995e (diff)
Merged over libXpm security fix provided by Chris Evans, Matthieu Herrb and
Alan Coopersmith from release 6.8.1. Fail during initialization with error if font/fontset is not set for widget. This prevents a sig11 later when the non-existent font/fontset structs are referenced. Check if xf86Info.kbdProc pointer is really set before calling it on abort as this pointer won't be set if the new modular keyboard driver is used (Matthias Hopf). Added new libs to the bindist control files. Removed inclusion of unnecessary kernel header on Linux. This may fail in an -ansi environment.
-rw-r--r--lisp/lisp.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/lisp.c b/lisp/lisp.c
index 15226f6..d21b4b4 100644
--- a/lisp/lisp.c
+++ b/lisp/lisp.c
@@ -46,7 +46,6 @@
#endif
#if defined(linux)
-#include <asm/page.h> /* for PAGE_SIZE */
#define HAS_GETPAGESIZE
#define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
#endif