[tkreuzer] 66704: [PSDK] Avoid redefinition of FILE_DEVICE_SMARTCARD in winsmcrd.h, when combined with wine/winioctl.h. A similar #ifdef exists in the MS header. - Ros-diffs

14 Mar 2015

Author: tkreuzer
Date: Sat Mar 14 15:34:48 2015
New Revision: 66704
URL: http://svn.reactos.org/svn/reactos?rev=66704&view=rev
Log:
[PSDK]
Avoid redefinition of FILE_DEVICE_SMARTCARD in winsmcrd.h, when combined with wine/winioctl.h. A similar #ifdef exists in the MS header.
Modified:
    trunk/reactos/include/psdk/winsmcrd.h
Modified: trunk/reactos/include/psdk/winsmcrd.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsmcrd.h?rev...
==============================================================================

--- trunk/reactos/include/psdk/winsmcrd.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winsmcrd.h	[iso-8859-1] Sat Mar 14 15:34:48 2015
@@ -60,7 +60,11 @@
   SCARD_IO_REQUEST ioRequest;
 } SCARD_T1_REQUEST, *PSCARD_T1_REQUEST, *LPSCARD_T1_REQUEST;
+#ifndef FILE_DEVICE_SMARTCARD
 #define FILE_DEVICE_SMARTCARD 49
+#elif FILE_DEVICE_SMARTCARD != 49
+#error "Incorrect Smart Card Device Definition"
+#endif
#define SCARD_ATR_LENGTH (0x21)

    