[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-xorg
Subject:    xorg/driver/xf86-input-magictouch - [PATCH] Remove macro defining
From:       pcpa () mandriva ! com ! br
Date:       2008-01-31 1:07:30
Message-ID: 20080130230730.vx9uqjelwelwcc80 () webmail ! conectiva ! com ! br
[Download RAW message or body]

This message is in MIME format.


  Patch 1 assumes XORG_SERVER_CURRENT will be updated to match git
master state, as currently in git X Server it will use the same value
as xorg-server-1.4.0.90.
  Otherwise some other method to know if xf86_ansic functions are
available should be used.


["0001-Remove-macro-defining-strdup-to-xf86strdup.patch" (text/x-patch)]

From b80db0448e729775f11d8f87593c8ba64850db3c Mon Sep 17 00:00:00 2001
From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com>
Date: Wed, 30 Jan 2008 22:54:26 -0200
Subject: [PATCH] Remove macro defining strdup to xf86strdup.

Removal is conditional to XORG_VERSION_CURRENT 10499002,
i.e. tag xorg-server-1.4.0.90
---
 src/xf86MagicTouch.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/xf86MagicTouch.c b/src/xf86MagicTouch.c
index 12992e6..efcb814 100644
--- a/src/xf86MagicTouch.c
+++ b/src/xf86MagicTouch.c
@@ -213,9 +213,11 @@ static int      debug_level = 0;
 #define read(fd, ptr, num) xf86ReadSerial(fd, ptr, num)
 #define write(fd, ptr, num) xf86WriteSerial(fd, ptr, num)
 #define close(fd) xf86CloseSerial(fd)
+#if XORG_VERSION_CURRENT <= (((1) * 10000000) + ((4) * 100000) + ((99) * 1000) + 2)
 #define strdup(str) xf86strdup(str)
 #endif
 
+#endif
 
 					
 
-- 
1.5.3.2


["0002-Fix-typo-emoveEnabledDevice-RemoveEnabledDevice.patch" (text/x-patch)]

From 2d88c7b82c9b3ed7e3d23dd380e5e2acfd198e49 Mon Sep 17 00:00:00 2001
From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com>
Date: Wed, 30 Jan 2008 22:58:21 -0200
Subject: [PATCH] Fix typo emoveEnabledDevice -> RemoveEnabledDevice.

Typo detected when searching for missing symbols.
---
 src/xf86MagicTouch.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/xf86MagicTouch.c b/src/xf86MagicTouch.c
index efcb814..9a81cbe 100644
--- a/src/xf86MagicTouch.c
+++ b/src/xf86MagicTouch.c
@@ -697,7 +697,7 @@ xf86MagicControl(DeviceIntPtr dev,
 			DBG(2, ErrorF("MagicTouch OFF\n") );
 			dev->public.on = FALSE;
 			if (local->fd>=0)
-			   emoveEnabledDevice(local->fd);
+			   RemoveEnabledDevice(local->fd);
 				
 			SYSCALL( close(local->fd) );
 			local->fd = -1;
-- 
1.5.3.2



_______________________________________________
xorg mailing list
xorg@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg

[prev in list] [next in list] [prev in thread] [next in thread]