[xmltooling] 09/24: Fix ordering issues with XSEC macro.

[Etienne Dysli Metref]

This is an automated email from the git hooks/post-receive script.

edm-guest pushed a commit to branch master
in repository xmltooling.

commit 2f66925e0a2411e6560d1feee51275e970663858
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Tue Nov 28 12:06:01 2017 -0500

    Fix ordering issues with XSEC macro.
---
 xmltooling/internal.h                  | 4 +---
 xmltoolingtest/InlineKeyResolverTest.h | 2 --
 xmltoolingtest/XMLObjectBaseTestCase.h | 4 ++++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xmltooling/internal.h b/xmltooling/internal.h
index fc577ac..3144fee 100644
--- a/xmltooling/internal.h
+++ b/xmltooling/internal.h
@@ -29,14 +29,12 @@
 # define _CRT_SECURE_NO_DEPRECATE 1
 # define _CRT_NONSTDC_NO_DEPRECATE 1
 # define _SCL_SECURE_NO_WARNINGS 1
+# define XSEC_HAVE_OPENSSL 1
 #endif
 
 // Export public APIs.
 #define XMLTOOLING_EXPORTS
 
-// Force XMLSEC to assume OpenSSL
-#define XSEC_HAVE_OPENSSL 1
-
 // eventually we might be able to support autoconf via cygwin...
 #if defined (_MSC_VER) || defined(__BORLANDC__)
 # include "config_win32.h"
diff --git a/xmltoolingtest/InlineKeyResolverTest.h b/xmltoolingtest/InlineKeyResolverTest.h
index 2e99fb9..86633b7 100644
--- a/xmltoolingtest/InlineKeyResolverTest.h
+++ b/xmltoolingtest/InlineKeyResolverTest.h
@@ -29,8 +29,6 @@
 #include <xmltooling/security/CredentialResolver.h>
 #include <xmltooling/signature/KeyInfo.h>
 
-#include <xsec/enc/XSECCryptoKey.hpp>
-
 #include <xsec/dsig/DSIGReference.hpp>
 #include <xsec/dsig/DSIGSignature.hpp>
 extern "C" {
diff --git a/xmltoolingtest/XMLObjectBaseTestCase.h b/xmltoolingtest/XMLObjectBaseTestCase.h
index 73200eb..5031baf 100644
--- a/xmltoolingtest/XMLObjectBaseTestCase.h
+++ b/xmltoolingtest/XMLObjectBaseTestCase.h
@@ -18,6 +18,10 @@
  * language governing permissions and limitations under the License.
  */
 
+#ifdef WIN32
+# define XSEC_HAVE_OPENSSL 1
+#endif
+
 #include <cxxtest/TestSuite.h>
 #include <xmltooling/AbstractAttributeExtensibleXMLObject.h>
 #include <xmltooling/AbstractComplexElement.h>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/xmltooling.git