[Pcsclite-cvs-commit] r4884 - in /trunk/PCSC/src: hotplug_libhal.c hotplug_libusb.c hotplug_linux.c hotplug_macosx.c readerfactory.h utils.c winscard_svc.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Sun Apr 18 11:49:35 2010
New Revision: 4884

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4884
Log:
Use pthread_t instead of PCSCLITE_THREAD_T

Modified:
    trunk/PCSC/src/hotplug_libhal.c
    trunk/PCSC/src/hotplug_libusb.c
    trunk/PCSC/src/hotplug_linux.c
    trunk/PCSC/src/hotplug_macosx.c
    trunk/PCSC/src/readerfactory.h
    trunk/PCSC/src/utils.c
    trunk/PCSC/src/winscard_svc.c

Modified: trunk/PCSC/src/hotplug_libhal.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/hotplug_libhal.c?rev=4884&op=diff
==============================================================================
--- trunk/PCSC/src/hotplug_libhal.c (original)
+++ trunk/PCSC/src/hotplug_libhal.c Sun Apr 18 11:49:35 2010
@@ -44,7 +44,7 @@
 
 PCSCLITE_MUTEX usbNotifierMutex;
 
-static PCSCLITE_THREAD_T usbNotifyThread;
+static pthread_t usbNotifyThread;
 static int driverSize = -1;
 static char AraKiriHotPlug = FALSE;
 

Modified: trunk/PCSC/src/hotplug_libusb.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/hotplug_libusb.c?rev=4884&op=diff
==============================================================================
--- trunk/PCSC/src/hotplug_libusb.c (original)
+++ trunk/PCSC/src/hotplug_libusb.c Sun Apr 18 11:49:35 2010
@@ -57,7 +57,7 @@
 
 PCSCLITE_MUTEX usbNotifierMutex;
 
-static PCSCLITE_THREAD_T usbNotifyThread;
+static pthread_t usbNotifyThread;
 static int driverSize = -1;
 static char AraKiriHotPlug = FALSE;
 static int rescan_pipe[] = { -1, -1 };

Modified: trunk/PCSC/src/hotplug_linux.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/hotplug_linux.c?rev=4884&op=diff
==============================================================================
--- trunk/PCSC/src/hotplug_linux.c (original)
+++ trunk/PCSC/src/hotplug_linux.c Sun Apr 18 11:49:35 2010
@@ -70,7 +70,7 @@
 static LONG HPReadBundleValues(void);
 static void HPEstablishUSBNotifications(void);
 
-static PCSCLITE_THREAD_T usbNotifyThread;
+static pthread_t usbNotifyThread;
 static int AraKiriHotPlug = FALSE;
 static int bundleSize = 0;
 

Modified: trunk/PCSC/src/hotplug_macosx.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/hotplug_macosx.c?rev=4884&op=diff
==============================================================================
--- trunk/PCSC/src/hotplug_macosx.c (original)
+++ trunk/PCSC/src/hotplug_macosx.c Sun Apr 18 11:49:35 2010
@@ -797,7 +797,7 @@
 }
 
 
-PCSCLITE_THREAD_T sHotplugWatcherThread;
+pthread_t sHotplugWatcherThread;
 
 /*
  * Sets up callbacks for device hotplug events.

Modified: trunk/PCSC/src/readerfactory.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.h?rev=4884&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.h (original)
+++ trunk/PCSC/src/readerfactory.h Sun Apr 18 11:49:35 2010
@@ -108,7 +108,7 @@
 		char lpcReader[MAX_READERNAME];	/**< Reader Name */
 		char *lpcLibrary;	/**< Library Path */
 		char *lpcDevice;	/**< Device Name */
-		PCSCLITE_THREAD_T pthThread;	/**< Event polling thread */
+		pthread_t pthThread;	/**< Event polling thread */
 		RESPONSECODE (*pthCardEvent)(DWORD);	/**< Card Event sync */
 		PCSCLITE_MUTEX *mMutex;	/**< Mutex for this connection */
 		list_t handlesList;

Modified: trunk/PCSC/src/utils.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/utils.c?rev=4884&op=diff
==============================================================================
--- trunk/PCSC/src/utils.c (original)
+++ trunk/PCSC/src/utils.c Sun Apr 18 11:49:35 2010
@@ -116,7 +116,7 @@
 	return r.tv_sec * 1000000 + r.tv_usec;
 } /* time_sub */
 
-int ThreadCreate(PCSCLITE_THREAD_T * pthThread, int attributes,
+int ThreadCreate(pthread_t * pthThread, int attributes,
 	PCSCLITE_THREAD_FUNCTION(pvFunction), LPVOID pvArg)
 {
 	pthread_attr_t attr;

Modified: trunk/PCSC/src/winscard_svc.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_svc.c?rev=4884&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_svc.c (original)
+++ trunk/PCSC/src/winscard_svc.c Sun Apr 18 11:49:35 2010
@@ -61,7 +61,7 @@
 	list_t cardsList;
 	PCSCLITE_MUTEX cardsList_lock;	/**< lock for the above list */
 	uint32_t dwClientID;			/**< Connection ID used to reference the Client. */
-	PCSCLITE_THREAD_T pthThread;		/**< Event polling thread's ID */
+	pthread_t pthThread;		/**< Event polling thread's ID */
 	int protocol_major, protocol_minor;	/**< Protocol number agreed between client and server*/
 };
 typedef struct _psContext SCONTEXT;