X Strike Force X.Org X11 SVN commit: r3761 - in trunk/driver/xserver-xorg-video-sis/debian: . patches
Author: dnusinow
Date: 2006-10-13 16:51:30 -0400 (Fri, 13 Oct 2006)
New Revision: 3761
Modified:
trunk/driver/xserver-xorg-video-sis/debian/changelog
trunk/driver/xserver-xorg-video-sis/debian/patches/02_missing_unistd.diff
Log:
we also need fcntl.h
Modified: trunk/driver/xserver-xorg-video-sis/debian/changelog
===================================================================
--- trunk/driver/xserver-xorg-video-sis/debian/changelog 2006-10-13 20:42:19 UTC (rev 3760)
+++ trunk/driver/xserver-xorg-video-sis/debian/changelog 2006-10-13 20:51:30 UTC (rev 3761)
@@ -1,12 +1,12 @@
-xserver-xorg-video-sis (1:0.9.1-4) UNRELEASED; urgency=low
+xserver-xorg-video-sis (1:0.9.1-4) unstable; urgency=low
* Add 01_missing_assert.diff to include assert.h because the driver now uses
the assert macro. Thanks Nate Eldredge. Closes: #392546
- * Add 02_missing_unistd.diff to include unistd.h because sis_regs.h uses
- various functions defined in there, and yet it doesn't include it. Thanks
- Martin Michlmayr. Closes: #392595
+ * Add 02_missing_unistd.diff to include unistd.h and fcntl.h because
+ sis_regs.h and sis_driver.c uses various functions defined in there, and
+ yet it doesn't include it. Thanks Martin Michlmayr. Closes: #392595
- -- David Nusinow <dnusinow@debian.org> Fri, 13 Oct 2006 16:39:59 -0400
+ -- David Nusinow <dnusinow@debian.org> Fri, 13 Oct 2006 16:50:58 -0400
xserver-xorg-video-sis (1:0.9.1-3) unstable; urgency=low
Modified: trunk/driver/xserver-xorg-video-sis/debian/patches/02_missing_unistd.diff
===================================================================
--- trunk/driver/xserver-xorg-video-sis/debian/patches/02_missing_unistd.diff 2006-10-13 20:42:19 UTC (rev 3760)
+++ trunk/driver/xserver-xorg-video-sis/debian/patches/02_missing_unistd.diff 2006-10-13 20:51:30 UTC (rev 3761)
@@ -1,13 +1,27 @@
Index: xserver-xorg-video-sis/src/sis_regs.h
===================================================================
---- xserver-xorg-video-sis.orig/src/sis_regs.h 2006-10-13 16:41:43.000000000 -0400
-+++ xserver-xorg-video-sis/src/sis_regs.h 2006-10-13 16:41:56.000000000 -0400
-@@ -32,6 +32,8 @@
+--- xserver-xorg-video-sis.orig/src/sis_regs.h 2006-10-13 16:42:09.000000000 -0400
++++ xserver-xorg-video-sis/src/sis_regs.h 2006-10-13 16:50:28.000000000 -0400
+@@ -32,6 +32,9 @@
#ifndef _SIS_REGS_H_
#define _SIS_REGS_H_
+#include <unistd.h>
++#include <fcntl.h>
+
/*
#define SIS_NEED_inSISREG
#define SIS_NEED_inSISREGW
+Index: xserver-xorg-video-sis/src/sis.h
+===================================================================
+--- xserver-xorg-video-sis.orig/src/sis.h 2006-10-13 16:50:35.000000000 -0400
++++ xserver-xorg-video-sis/src/sis.h 2006-10-13 16:50:50.000000000 -0400
+@@ -40,6 +40,8 @@
+ #include <math.h>
+ #include <setjmp.h>
+ #include <assert.h>
++#include <unistd.h>
++#include <fcntl.h>
+
+ #define SISDRIVERVERSIONYEAR 5
+ #define SISDRIVERVERSIONMONTH 9
Reply to: