summaryrefslogtreecommitdiffstats
path: root/libtomcrypt/headers/tomcrypt_cfg.h
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2010-08-27 09:31:07 +0200
committerMiloslav Trmač <mitr@redhat.com>2010-08-27 09:31:07 +0200
commit3d758323280763fe59b1f61d4f86aa2a29fe3775 (patch)
treef195a8cb4aa2ff6fbb5a51e0e6c13df1968401b6 /libtomcrypt/headers/tomcrypt_cfg.h
parent40b5088d61e6f0830302b253ad407d06e46364b6 (diff)
parentdd5317620d70e6b438e40370163257e47ca385a3 (diff)
downloadkernel-crypto-3d758323280763fe59b1f61d4f86aa2a29fe3775.tar.gz
kernel-crypto-3d758323280763fe59b1f61d4f86aa2a29fe3775.tar.xz
kernel-crypto-3d758323280763fe59b1f61d4f86aa2a29fe3775.zip
Merge remote branch 'standalone/master' into standalone-master
Conflicts: cryptodev_main.c ncr-int.h ncr.c
Diffstat (limited to 'libtomcrypt/headers/tomcrypt_cfg.h')
-rw-r--r--libtomcrypt/headers/tomcrypt_cfg.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libtomcrypt/headers/tomcrypt_cfg.h b/libtomcrypt/headers/tomcrypt_cfg.h
index b750c8be78c..8ad90bce4b0 100644
--- a/libtomcrypt/headers/tomcrypt_cfg.h
+++ b/libtomcrypt/headers/tomcrypt_cfg.h
@@ -42,9 +42,9 @@ LTC_EXPORT int LTC_CALL XSTRCMP(const char *s1, const char *s2);
#endif
-/* type of argument checking, 0=default, 1=fatal and 2=error+continue, 3=nothing */
+/* type of argument checking, 0=default, 1=fatal and 2=error+continue, 3=nothing, 4=return error */
#ifndef ARGTYPE
- #define ARGTYPE 0
+ #define ARGTYPE 4
#endif
/* Controls endianess and size of registers. Leave uncommented to get platform neutral [slower] code