X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=config_win32.h;h=ed324c2b5a25adbab761ded17d804e24337ee89c;hb=eab22660b1e5678870b4750af89a963476e38c3f;hp=c79070c6698951a1315196411758ec290c995a95;hpb=30285d320ac39f4ab899901609d0ad8ff13f4946;p=shibboleth%2Fcpp-xmltooling.git diff --git a/config_win32.h b/config_win32.h index c79070c..ed324c2 100644 --- a/config_win32.h +++ b/config_win32.h @@ -3,6 +3,11 @@ /* Define if C++ compiler supports covariant virtual methods. */ #define HAVE_COVARIANT_RETURNS 1 +/* Define to 1 if C++ compiler supports nullptr keyword. */ +#if _MSC_VER >= 1600 +# define HAVE_NULLPTR 1 +#endif + /* Define to 1 if you have the header file. */ /* #undef HAVE_DLFCN_H */ @@ -72,6 +77,8 @@ # define XMLTOOLING_XERCESC_BOOLSETIDATTRIBUTE 1 # define XMLTOOLING_XERCESC_64BITSAFE 1 # define XMLTOOLING_XERCESC_INPUTSTREAM_HAS_CONTENTTYPE 1 +#else +# define XMLTOOLING_XERCESC_HAS_XMLBYTE_RELEASE #endif /* Define to 1 if you have the `xsecsize_t' type. */ @@ -90,13 +97,13 @@ #define PACKAGE_NAME "xmltooling" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "xmltooling 1.3.3" +#define PACKAGE_STRING "xmltooling 1.4" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "xmltooling" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.3.3" +#define PACKAGE_VERSION "1.4" /* Define to the necessary symbol if this constant uses a non-standard name on your system. */ @@ -109,7 +116,7 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "1.3.3" +#define VERSION "1.4" /* Define if you wish to disable XML-Security-dependent features. */ /* #undef XMLTOOLING_NO_XMLSEC */ @@ -117,6 +124,14 @@ /* Define if you wish to disable Xalan-dependent features. */ #define XSEC_NO_XALAN +#ifndef XMLTOOLING_NO_XMLSEC +# include +# if (_XSEC_VERSION_FULL >= 10600) +# define XMLTOOLING_XMLSEC_MULTIPLECRL 1 +# define XMLTOOLING_XMLSEC_SIGALGORITHM 1 +# endif +#endif + /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */