Patch for compiling SiS statically

[Matthias Hopf]

Hi,

the following patch is needed to compile the SiS driver (and anything
potentially using setjmp/longjmp) statically.

If noone objects, I'll commit the code at the beginning of the next week.

Matthias

-- 
Matthias Hopf <mhopf at suse.de>       __        __   __
Maxfeldstr. 5 / 90409 Nuernberg    (_   | |  (_   |__         mat at mshopf.de
Phone +49-911-74053-715            __)  |_|  __)  |__  labs   www.mshopf.de
-------------- next part --------------
Index: programs/Xserver/hw/xfree86/drivers/sis/sis_memcpy.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_memcpy.c,v
retrieving revision 1.21
diff -u -p -r1.21 sis_memcpy.c
--- programs/Xserver/hw/xfree86/drivers/sis/sis_memcpy.c	11 Aug 2005 12:59:18 -0000	1.21
+++ programs/Xserver/hw/xfree86/drivers/sis/sis_memcpy.c	28 Oct 2005 16:55:11 -0000
@@ -32,6 +32,8 @@
 #endif
 
 #include "sis.h"
+#define NEED_XF86_TYPES 1
+#include "xf86_libc.h"
 
 #if 0			/* Debug */
 #define SISDGBMC
Index: programs/Xserver/hw/xfree86/os-support/xf86_libc.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v
retrieving revision 1.9
diff -u -p -r1.9 xf86_libc.h
--- programs/Xserver/hw/xfree86/os-support/xf86_libc.h	24 Aug 2005 11:18:31 -0000	1.9
+++ programs/Xserver/hw/xfree86/os-support/xf86_libc.h	28 Oct 2005 16:55:11 -0000
@@ -721,6 +721,8 @@ typedef int xf86jmp_buf[1024];
 #define longjmp(a,b)            xf86longjmp(a,b) 
 #undef jmp_buf
 #define jmp_buf                 xf86jmp_buf
+#else
+#include <setjmp.h>
 #endif
 
 #endif /* XF86_LIBC_H */