Updated error.c and version_features.c based on changes

This commit is contained in:
Paul Bakker 2014-04-30 17:01:25 +02:00
parent cf975f5988
commit 2ca1dc8958
3 changed files with 10 additions and 5 deletions

View file

@ -1,7 +1,7 @@
/* /*
* Error message information * Error message information
* *
* Copyright (C) 2006-2012, Brainspark B.V. * Copyright (C) 2006-2014, Brainspark B.V.
* *
* This file is part of PolarSSL (http://www.polarssl.org) * This file is part of PolarSSL (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org> * Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>

View file

@ -35,12 +35,13 @@
#include <string.h> #include <string.h>
#if defined(_MSC_VER) && !defined snprintf && !defined(EFIX64) && \ #if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \
!defined(EFI32) !defined(EFI32)
#define snprintf _snprintf #define strcasecmp _stricmp
#endif #endif
const char *features[] = { const char *features[] = {
#if defined(POLARSSL_VERSION_FEATURES)
#if defined(POLARSSL_HAVE_INT8) #if defined(POLARSSL_HAVE_INT8)
"POLARSSL_HAVE_INT8", "POLARSSL_HAVE_INT8",
#endif /* POLARSSL_HAVE_INT8 */ #endif /* POLARSSL_HAVE_INT8 */
@ -524,6 +525,7 @@ const char *features[] = {
#if defined(POLARSSL_XTEA_C) #if defined(POLARSSL_XTEA_C)
"POLARSSL_XTEA_C", "POLARSSL_XTEA_C",
#endif /* POLARSSL_XTEA_C */ #endif /* POLARSSL_XTEA_C */
#endif
NULL NULL
}; };
@ -531,6 +533,9 @@ int version_check_feature( const char *feature )
{ {
const char **idx = features; const char **idx = features;
if( *idx == NULL )
return( -2 );
if( feature == NULL ) if( feature == NULL )
return( -1 ); return( -1 );

View file

@ -35,9 +35,9 @@
#include <string.h> #include <string.h>
#if defined(_MSC_VER) && !defined snprintf && !defined(EFIX64) && \ #if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \
!defined(EFI32) !defined(EFI32)
#define snprintf _snprintf #define strcasecmp _stricmp
#endif #endif
const char *features[] = { const char *features[] = {