diff options
author | sangwan.kwon <sangwan.kwon@samsung.com> | 2016-07-28 15:17:14 +0900 |
---|---|---|
committer | sangwan.kwon <sangwan.kwon@samsung.com> | 2016-07-28 15:17:14 +0900 |
commit | 1ca1a139b4c1a00de4d72f64b7411e118111a161 (patch) | |
tree | 2c93e5dbce5b42d1efd45520b1c8cd50b6bf6998 /include/xmlsec/errors.h | |
parent | fe8ea3dba5971ab3f47090ba52d7f824c3d23545 (diff) | |
parent | d4d35351fd63a7051a7cbef2002cb0c641925ec3 (diff) | |
download | xmlsec1-1ca1a139b4c1a00de4d72f64b7411e118111a161.tar.gz xmlsec1-1ca1a139b4c1a00de4d72f64b7411e118111a161.tar.bz2 xmlsec1-1ca1a139b4c1a00de4d72f64b7411e118111a161.zip |
Merge branch 'upstream' into tizen
Change-Id: Iacc73c9ed5e9cfd188df62c405426bfa89bf4e51
Diffstat (limited to 'include/xmlsec/errors.h')
-rw-r--r-- | include/xmlsec/errors.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/xmlsec/errors.h b/include/xmlsec/errors.h index 6e23620c..32ac2fec 100644 --- a/include/xmlsec/errors.h +++ b/include/xmlsec/errors.h @@ -6,7 +6,7 @@ * This is free software; see Copyright file in the source * distribution for preciese wording. * - * Copyright (C) 2002-2003 Aleksey Sanin <aleksey@aleksey.com> + * Copyright (C) 2002-2016 Aleksey Sanin <aleksey@aleksey.com>. All Rights Reserved. */ #ifndef __XMLSEC_ERRORS_H__ #define __XMLSEC_ERRORS_H__ @@ -370,7 +370,7 @@ extern "C" { * xmlSecErrorsCallback: * @file: the error location file name (__FILE__ macro). * @line: the error location line number (__LINE__ macro). - * @func: the error location function name (__FUNCTION__ macro). + * @func: the error location function name (__func__ macro). * @errorObject: the error specific error object * @errorSubject: the error specific error subject. * @reason: the error code. @@ -407,7 +407,7 @@ XMLSEC_EXPORT const char* xmlSecErrorsGetMsg (xmlSecSize pos) /* __FUNCTION__ is defined for MSC compiler < MS VS .NET 2003 */ #if defined(_MSC_VER) && (_MSC_VER >= 1300) -#define __XMLSEC_FUNCTION__ __FUNCTION__ +#define __XMLSEC_FUNCTION__ __FUNCTION__ #endif /* _MSC_VER */ /* fallback for __FUNCTION__ */ |