resolve pull request merge conflict

This commit is contained in:
toddouska
2014-03-25 11:39:07 -07:00
parent 8c5d958a8b
commit fb6d671629
38 changed files with 55 additions and 40 deletions

View File

@@ -25,7 +25,7 @@
#include <cyassl/ctaocrypt/settings.h>
#include <cyassl/ctaocrypt/error.h>
#include <cyassl/ctaocrypt/error-crypt.h>
#ifdef _MSC_VER
/* 4996 warning to use MS extensions e.g., strcpy_s instead of XSTRNCPY */