[Pcsclite-cvs-commit] r4912 - /trunk/PCSC/src/eventhandler.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Mon May  3 09:30:25 2010
New Revision: 4912

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4912
Log:
EHDestroyEventHandler(): use pthread_cancel() only if it is present (not
the case on Android)

Modified:
    trunk/PCSC/src/eventhandler.c

Modified: trunk/PCSC/src/eventhandler.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/eventhandler.c?rev=4912&op=diff
==============================================================================
--- trunk/PCSC/src/eventhandler.c (original)
+++ trunk/PCSC/src/eventhandler.c Mon May  3 09:30:25 2010
@@ -174,12 +174,14 @@
 	rv = IFDGetCapabilities(rContext, TAG_IFD_POLLING_THREAD_KILLABLE,
 		&dwGetSize, ucGetData);
 
+#ifdef HAVE_PTHREAD_CANCEL
 	if ((IFD_SUCCESS == rv) && (1 == dwGetSize) && ucGetData[0])
 	{
 		Log1(PCSC_LOG_INFO, "Killing polling thread");
 		(void)pthread_cancel(rContext->pthThread);
 	}
 	else
+#endif
 		Log1(PCSC_LOG_INFO, "Waiting polling thread");
 
 	/* wait for the thread to finish */