--- sourceforge.net/trunk/rdesktop/tcp.c	2006/11/01 20:52:01	1309
+++ sourceforge.net/trunk/rdesktop/tcp.c	2006/11/03 23:51:35	1328
@@ -46,7 +46,7 @@
 	STREAM result = NULL;
 
 #ifdef WITH_SCARD
-	scard_tcp_lock();
+	scard_lock(SCARD_LOCK_TCP);
 	result = scard_tcp_init();
 #else
 	result = &out;
@@ -61,7 +61,7 @@
 	result->p = result->data;
 	result->end = result->data + result->size;
 #ifdef WITH_SCARD
-	scard_tcp_unlock();
+	scard_unlock(SCARD_LOCK_TCP);
 #endif
 	return result;
 }
@@ -74,7 +74,7 @@
 	int sent, total = 0;
 
 #ifdef WITH_SCARD
-	scard_tcp_lock();
+	scard_lock(SCARD_LOCK_TCP);
 #endif
 	while (total < length)
 	{
@@ -88,7 +88,7 @@
 		total += sent;
 	}
 #ifdef WITH_SCARD
-	scard_tcp_unlock();
+	scard_unlock(SCARD_LOCK_TCP);
 #endif
 }