[Pcsclite-cvs-commit] r419 - in trunk/PKCS11: include src

[Ludovic Rousseau]

Author: rousseau
Date: 2006-03-28 13:16:31 +0000 (Tue, 28 Mar 2006)
New Revision: 419

Modified:
   trunk/PKCS11/include/cryptoki.h
   trunk/PKCS11/src/p11x_util.c
Log:
do not use __const in strnlen() declaration (always use const instead)

Thanks to Iain MacDonnell for the patch


Modified: trunk/PKCS11/include/cryptoki.h
===================================================================
--- trunk/PKCS11/include/cryptoki.h	2006-03-28 13:10:16 UTC (rev 418)
+++ trunk/PKCS11/include/cryptoki.h	2006-03-28 13:16:31 UTC (rev 419)
@@ -479,11 +479,7 @@
    CK_RV util_PadStrSet(CK_CHAR *string, CK_CHAR *value, CK_ULONG size);
    CK_RV util_StripPKCS1(CK_BYTE *data, CK_ULONG len, CK_BYTE *output, CK_ULONG *out_len);
 #ifndef __USE_GNU
-#ifndef WIN32
-   size_t strnlen(__const char *__string, size_t __maxlen);
-#else
    size_t strnlen(const char *__string, size_t __maxlen);
-#endif
 #endif /* __USE_GNU */
 CK_BBOOL util_IsLittleEndian();
 

Modified: trunk/PKCS11/src/p11x_util.c
===================================================================
--- trunk/PKCS11/src/p11x_util.c	2006-03-28 13:10:16 UTC (rev 418)
+++ trunk/PKCS11/src/p11x_util.c	2006-03-28 13:16:31 UTC (rev 419)
@@ -143,11 +143,7 @@
 **  none
 *******************************************************************************/
 #ifndef __USE_GNU
-#ifndef WIN32
-size_t strnlen(__const char *__string, size_t __maxlen)
-#else
 size_t strnlen(const char *__string, size_t __maxlen)
-#endif
 {
     size_t i;