- cleaner version from XFree86-sparc-kbd.patch (don't redefine already defined symbol)

Changed files:
    X11-sparc-kbd.patch -> 1.2

diff --git a/X11-sparc-kbd.patch b/X11-sparc-kbd.patch
index 592927ee6f555d6e6eff44343c5a22d404f74ace..27b1d4ac1ed494cc2ca957b09011174d9a66d1bd 100644 (file)
--- a/X11-sparc-kbd.patch
+++ b/X11-sparc-kbd.patch
@@ -1,26 +1,40 @@
---- X11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-04-23 19:54:08.000000000 +0000
-+++ X11-6.8.1_new/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c     2004-10-09 16:00:17.521486684 +0000
-@@ -114,6 +114,10 @@
+--- X11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c.orig    2004-04-23 21:54:08.000000000 +0200
++++ X11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-10-31 01:40:55.056608568 +0200
+@@ -114,6 +114,8 @@
  #endif /* KDKBDREP */
  }
  
-+#ifdef __sparc__ 
-+# define rate rate 
-+#endif
++#undef rate
 +
  static int
  KIOCSRATE_ioctl_ok(int rate, int delay) {
  #ifdef KIOCSRATE
---- X11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c        2004-04-23 19:54:08.000000000 +0000
-+++ X11-6.8.1_new/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c    2004-10-09 15:58:57.060022567 +0000
-@@ -142,6 +142,10 @@
+@@ -141,8 +143,6 @@
+ #endif /* KIOCSRATE */
+ }
+ 
+-#undef rate
+-
+ void xf86SetKbdRepeat(char rad)
+ {
+ #ifdef __sparc__
+--- X11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c.orig   2004-04-23 21:54:08.000000000 +0200
++++ X11-6.8.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c        2004-10-31 01:41:26.201873768 +0200
+@@ -142,6 +142,8 @@
  #endif /* KDKBDREP */
  }
  
-+#ifdef __sparc__
-+#  define rate rate 
-+#endif
++#undef rate
 +
  static int
  KIOCSRATE_ioctl_ok(int rate, int delay) {
  #ifdef KIOCSRATE
+@@ -169,8 +171,6 @@
+ #endif /* KIOCSRATE */
+ }
+ 
+-#undef rate
+-
+ static void
+ SetKbdRepeat(InputInfoPtr pInfo, char rad)
+ {