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

Wrap the Propolice fix in #ifdef __SSP__; Propolice doesn't define this yet 

but an RFE has been submitted upstream.
This commit is contained in:
Adam Jackson 2004-08-12 01:30:57 +00:00
parent e30c22dbbf
commit 09d0056b8b
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xfree86/loader/xf86sym.c
View File

@ -235,6 +235,12 @@ extern unsigned long ldl_brx(volatile unsigned char *, int);
extern unsigned short ldw_brx(volatile unsigned char *, int); extern unsigned short ldw_brx(volatile unsigned char *, int);
#endif #endif
#ifdef __SSP__
/* Propolice! */
extern long __guard[];
extern void __stack_smash_handler(char [], int);
#endif
/* XFree86 things */ /* XFree86 things */
LOOKUP xfree86LookupTab[] = { LOOKUP xfree86LookupTab[] = {
@ -1097,6 +1103,12 @@ LOOKUP xfree86LookupTab[] = {
#endif #endif
#endif #endif
#ifdef __SSP__
/* propolice */
SYMFUNC(__stack_smash_handler)
SYMVAR(__guard)
#endif
/* Some variables. */ /* Some variables. */
SYMVAR(xf86stdin) SYMVAR(xf86stdin)