diff -ur ifd-egate-0.05_orig/Makefile-OSX ifd-egate-0.05_new/Makefile-OSX
--- ifd-egate-0.05_orig/Makefile-OSX	2004-01-02 17:03:04.000000000 -0600
+++ ifd-egate-0.05_new/Makefile-OSX	2006-01-29 00:36:16.000000000 -0600
@@ -1,7 +1,7 @@
 libifd_egate.dylib: egate.o ifdhandler.o
 	$(CC) -dynamiclib $(LDFLAGS) -o $@ egate.o ifdhandler.o -lusb

-CFLAGS=-fPIC $(PCSC_CFLAGS) $(USB_CFLAGS) -g -Wall
+CFLAGS=-fPIC $(PCSC_CFLAGS) $(USB_CFLAGS) -g -Wall -I/usr/local/include/PCSC
 LDFLAGS=$(PCSC_LDFLAGS) $(USB_LDFLAGS)

 clean::
diff -ur ifd-egate-0.05_orig/egate.c ifd-egate-0.05_new/egate.c
--- ifd-egate-0.05_orig/egate.c	2004-01-02 17:08:34.000000000 -0600
+++ ifd-egate-0.05_new/egate.c	2006-01-29 01:17:25.000000000 -0600
@@ -40,12 +40,12 @@
 #endif

 int do_usb(usb_dev_handle * dev, int requesttype, int request,
-       int value, int index, char *bytes, int size, int timeout)
+       int value, int index, u_int8_t *bytes, int size, int timeout)
 {
 	int rc;

 	rc = usb_control_msg(dev, requesttype, request, value, index,
-			     bytes, size, timeout);
+			     (char *)bytes, size, timeout);
 	if (rc == -1) {
 		syslog(LOG_ERR,"usb_control_msg returned %u, error is %s",
 		       rc, usb_strerror());
@@ -84,7 +84,7 @@
 	        return 0;
         }
 	rc = do_usb(myhandle, USB_ENDPOINT_IN|USB_TYPE_VENDOR,
-		    EGATE_CMD_FETCHSTATUS,0, 0, &c, 1, 10000);
+		    EGATE_CMD_FETCHSTATUS,0, 0, (unsigned char*)&c, 1, 10000);
         if (!egate->usb)
 	   usb_close(myhandle);
 	sleep(1);
@@ -99,7 +99,7 @@
              int pollrc; \
      pollrc = do_usb(egate->usb, USB_ENDPOINT_IN|USB_TYPE_VENDOR, \
 		     EGATE_CMD_FETCHSTATUS, 0, 0, \
-		     &egate->stat, 1, 10000); \
+		     (unsigned char*)&egate->stat, 1, 10000); \
      if (pollrc != 1) \
 	   return 0; \
      } while ((egate->stat & EGATE_STAT_MASK) == EGATE_STAT_BUSY && (usleep(100) || 1)); \
@@ -112,7 +112,7 @@
 int power_up_egate(struct egate *egate)
 {
 	int rc, len;
-	u_int8_t buffer[1024];
+	unsigned char buffer[1024];
 	struct usb_bus *mybus;
 	struct usb_device *mydev;

@@ -235,7 +235,7 @@

 	/* send via usb */
 	rc = do_usb(egate->usb, USB_TYPE_VENDOR, EGATE_CMD_SENDCMD, 
-		    0, 0, buffer_out, 5, 10000);
+		    0, 0, (unsigned char*)buffer_out, 5, 10000);
 	if (rc != 5) {
 		/* not the whole buffer was transmitted ! */
                 egate_condreset(egate, 0);
diff -ur ifd-egate-0.05_orig/ifdhandler.h ifd-egate-0.05_new/ifdhandler.h
--- ifd-egate-0.05_orig/ifdhandler.h	2003-03-26 13:02:01.000000000 -0600
+++ ifd-egate-0.05_new/ifdhandler.h	2006-01-29 00:50:55.000000000 -0600
@@ -24,11 +24,10 @@

 	typedef struct _DEVICE_CAPABILITIES
 	{
-
-		LPSTR Vendor_Name;		/* Tag 0x0100 */
-		LPSTR IFD_Type;			/* Tag 0x0101 */
+		LPTSTR Vendor_Name;		/* Tag 0x0100 */
+		LPTSTR IFD_Type;			/* Tag 0x0101 */
 		DWORD IFD_Version;		/* Tag 0x0102 */
-		LPSTR IFD_Serial;		/* Tag 0x0103 */
+		LPTSTR IFD_Serial;		/* Tag 0x0103 */
 		DWORD IFD_Channel_ID;	/* Tag 0x0110 */

 		DWORD Asynch_Supported;	/* Tag 0x0120 */
@@ -44,23 +43,19 @@
 		DWORD Mechanics_Supported;	/* Tag 0x0150 */
 		DWORD Vendor_Features;	/* Tag 0x0180 - 0x01F0 User Defined. */

-	}
-	DEVICE_CAPABILITIES, *PDEVICE_CAPABILITIES;
+	} DEVICE_CAPABILITIES, *PDEVICE_CAPABILITIES;

 	typedef struct _ICC_STATE
 	{
-
 		UCHAR ICC_Presence;		/* Tag 0x0300 */
 		UCHAR ICC_Interface_Status;	/* Tag 0x0301 */
 		UCHAR ATR[MAX_ATR_SIZE];	/* Tag 0x0303 */
 		UCHAR ICC_Type;			/* Tag 0x0304 */

-	}
-	ICC_STATE, *PICC_STATE;
+	} ICC_STATE, *PICC_STATE;

 	typedef struct _PROTOCOL_OPTIONS
 	{
-
 		DWORD Protocol_Type;	/* Tag 0x0201 */
 		DWORD Current_Clock;	/* Tag 0x0202 */
 		DWORD Current_F;		/* Tag 0x0203 */
@@ -72,15 +67,13 @@
 		DWORD Current_BWT;		/* Tag 0x0209 */
 		DWORD Current_CWT;		/* Tag 0x020A */
 		DWORD Current_EBC;		/* Tag 0x020B */
-	}
-	PROTOCOL_OPTIONS, *PPROTOCOL_OPTIONS;
+	} PROTOCOL_OPTIONS, *PPROTOCOL_OPTIONS;

 	typedef struct _SCARD_IO_HEADER
 	{
 		DWORD Protocol;
 		DWORD Length;
-	}
-	SCARD_IO_HEADER, *PSCARD_IO_HEADER;
+	} SCARD_IO_HEADER, *PSCARD_IO_HEADER;

 	/*
 	 * End of structure list 
@@ -146,11 +139,9 @@
 	RESPONSECODE IFDHCloseChannel(DWORD);
 	RESPONSECODE IFDHGetCapabilities(DWORD, DWORD, PDWORD, PUCHAR);
 	RESPONSECODE IFDHSetCapabilities(DWORD, DWORD, DWORD, PUCHAR);
-	RESPONSECODE IFDHSetProtocolParameters(DWORD, DWORD, UCHAR,
-		UCHAR, UCHAR, UCHAR);
+	RESPONSECODE IFDHSetProtocolParameters(DWORD, DWORD, UCHAR, UCHAR, UCHAR, UCHAR);
 	RESPONSECODE IFDHPowerICC(DWORD, DWORD, PUCHAR, PDWORD);
-	RESPONSECODE IFDHTransmitToICC(DWORD, SCARD_IO_HEADER, PUCHAR,
-		DWORD, PUCHAR, PDWORD, PSCARD_IO_HEADER);
+	RESPONSECODE IFDHTransmitToICC(DWORD, SCARD_IO_HEADER, PUCHAR, DWORD, PUCHAR, PDWORD, PSCARD_IO_HEADER);
 	RESPONSECODE IFDHControl(DWORD, PUCHAR, DWORD, PUCHAR, PDWORD);
 	RESPONSECODE IFDHICCPresence(DWORD);

@@ -162,14 +153,12 @@
 	RESPONSECODE IO_Close_Channel();
 	RESPONSECODE IFD_Get_Capabilities(DWORD, PUCHAR);
 	RESPONSECODE IFD_Set_Capabilities(DWORD, PUCHAR);
-	RESPONSECODE IFD_Set_Protocol_Parameters(DWORD, UCHAR, UCHAR,
-		UCHAR, UCHAR);
+	RESPONSECODE IFD_Set_Protocol_Parameters(DWORD, UCHAR, UCHAR, UCHAR, UCHAR);
 	RESPONSECODE IFD_Power_ICC(DWORD);
 	RESPONSECODE IFD_Swallow_ICC();
 	RESPONSECODE IFD_Eject_ICC();
 	RESPONSECODE IFD_Confiscate_ICC();
-	RESPONSECODE IFD_Transmit_to_ICC(SCARD_IO_HEADER, PUCHAR, DWORD,
-		PUCHAR, PDWORD, PSCARD_IO_HEADER);
+	RESPONSECODE IFD_Transmit_to_ICC(SCARD_IO_HEADER, PUCHAR, DWORD, PUCHAR, PDWORD, PSCARD_IO_HEADER);
 	RESPONSECODE IFD_Is_ICC_Present();
 	RESPONSECODE IFD_Is_ICC_Absent();