From ce8fe4d0e47bb9bba391ba214cb3f3ad5e2b0ced Mon Sep 17 00:00:00 2001
From: Michael Gernoth <michael@gernoth.net>
Date: Thu, 4 Jan 2007 14:38:48 +0000
Subject: [PATCH] RD_ prefix

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1366 423420c4-83ab-492f-b58f-81f9feb106b5
---
 scard.c | 40 ++++++++++++++++++++--------------------
 scard.h |  2 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/scard.c b/scard.c
index 61178b1..fdd4112 100644
--- a/scard.c
+++ b/scard.c
@@ -79,29 +79,29 @@ scardSetInfo(uint32 device, uint32 id, uint32 bytes_out)
 
 #ifndef MAKE_PROTO
 
-static NTSTATUS
+static RD_NTSTATUS
 scard_create(uint32 device_id, uint32 accessmask, uint32 sharemode, uint32 create_disposition,
-	     uint32 flags_and_attributes, char *filename, NTHANDLE * phandle)
+	     uint32 flags_and_attributes, char *filename, RD_NTHANDLE * phandle)
 {
-	return STATUS_SUCCESS;
+	return RD_STATUS_SUCCESS;
 }
 
-static NTSTATUS
-scard_close(NTHANDLE handle)
+static RD_NTSTATUS
+scard_close(RD_NTHANDLE handle)
 {
-	return STATUS_SUCCESS;
+	return RD_STATUS_SUCCESS;
 }
 
-static NTSTATUS
-scard_read(NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
+static RD_NTSTATUS
+scard_read(RD_NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
 {
-	return STATUS_SUCCESS;
+	return RD_STATUS_SUCCESS;
 }
 
-static NTSTATUS
-scard_write(NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
+static RD_NTSTATUS
+scard_write(RD_NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
 {
-	return STATUS_SUCCESS;
+	return RD_STATUS_SUCCESS;
 }
 #endif /* MAKE_PROTO */
 
@@ -2167,8 +2167,8 @@ TS_SCardAccessStartedEvent(STREAM in, STREAM out)
 }
 
 
-static NTSTATUS
-scard_device_control(NTHANDLE handle, uint32 request, STREAM in, STREAM out)
+static RD_NTSTATUS
+scard_device_control(RD_NTHANDLE handle, uint32 request, STREAM in, STREAM out)
 {
 	SERVER_DWORD Result = 0x00000000;
 	unsigned char *psize, *pend, *pStatusCode;
@@ -2368,7 +2368,7 @@ scard_device_control(NTHANDLE handle, uint32 request, STREAM in, STREAM out)
 	hexdump(pbeg, (size_t) (out->p) - (size_t) pbeg);
 	DEBUG_SCARD(("--------------------------------\n"));
 #endif
-	return STATUS_SUCCESS;
+	return RD_STATUS_SUCCESS;
 }
 
 /* Thread functions */
@@ -2423,7 +2423,7 @@ freeStream(PMEM_HANDLE * handle, STREAM s)
 }
 
 static PSCThreadData
-SC_addToQueue(NTHANDLE handle, uint32 request, STREAM in, STREAM out)
+SC_addToQueue(RD_NTHANDLE handle, uint32 request, STREAM in, STREAM out)
 {
 	PMEM_HANDLE lcHandle = NULL;
 	PSCThreadData data = SC_xmalloc(&lcHandle, sizeof(TSCThreadData));
@@ -2613,13 +2613,13 @@ queue_handler_function(void *data)
 	return NULL;
 }
 
-static NTSTATUS
-thread_wrapper(NTHANDLE handle, uint32 request, STREAM in, STREAM out)
+static RD_NTSTATUS
+thread_wrapper(RD_NTHANDLE handle, uint32 request, STREAM in, STREAM out)
 {
 	if (SC_addToQueue(handle, request, in, out))
-		return STATUS_PENDING | 0xC0000000;
+		return RD_STATUS_PENDING | 0xC0000000;
 	else
-		return STATUS_NO_SUCH_FILE;
+		return RD_STATUS_NO_SUCH_FILE;
 }
 
 DEVICE_FNS scard_fns = {
diff --git a/scard.h b/scard.h
index bb753d5..723c7c4 100644
--- a/scard.h
+++ b/scard.h
@@ -151,7 +151,7 @@ typedef struct _TSCThreadData
 {
 	uint32 device;
 	uint32 id;
-	NTHANDLE handle;
+	RD_NTHANDLE handle;
 	uint32 request;
 	STREAM in;
 	STREAM out;