Adjust VC build for parallel make, fixes for SSPCPP-344.

[shibboleth/cpp-sp.git] / shibsp / version.h

diff --git a/shibsp/version.h b/shibsp/version.h
index 4394e9c..8e860ba 100644 (file)
--- a/shibsp/version.h
+++ b/shibsp/version.h
@@ -1,11 +1,12 @@
 /*
- *  Copyright 2001-2009 Internet2
+ * Licensed to UCAID under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may not use this
+ * file except in compliance with the License.  You may obtain a copy of the
+ * License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +18,7 @@
 /**
  * version.h
  *
- * Library version macros and constants
+ * Library version macros and constants.
  */
 
 #ifndef __shibsp_version_h__
@@ -27,6 +28,7 @@
 // support this kind of stuff in the future. If they ever yank some
 // of this stuff, it can be copied into here.
 
+#include <shibsp/base.h>
 #include <xercesc/util/XercesVersion.hpp>
 
 // ---------------------------------------------------------------------------
@@ -38,8 +40,8 @@
  */
 
 #define SHIBSP_VERSION_MAJOR 1
-#define SHIBSP_VERSION_MINOR 4
-#define SHIBSP_VERSION_REVISION 3
+#define SHIBSP_VERSION_MINOR 5
+#define SHIBSP_VERSION_REVISION 0
 
 /** DO NOT MODIFY BELOW THIS LINE */
 
@@ -60,11 +62,12 @@
 #define SHIBSP_FULLVERSIONNUM INVK_CAT3_SEP_NIL(SHIBSP_VERSION_MAJOR,SHIBSP_VERSION_MINOR,SHIBSP_VERSION_REVISION)
 #define SHIBSP_VERSIONSTR     INVK_CAT2_SEP_UNDERSCORE(SHIBSP_VERSION_MAJOR,SHIBSP_VERSION_MINOR)
 
-const char* const    gShibSPVersionStr = SHIBSP_VERSIONSTR;
-const char* const    gShibSPFullVersionStr = SHIBSP_FULLVERSIONSTR;
-const unsigned int   gShibSPMajVersion = SHIBSP_VERSION_MAJOR;
-const unsigned int   gShibSPMinVersion = SHIBSP_VERSION_MINOR;
-const unsigned int   gShibSPRevision   = SHIBSP_VERSION_REVISION;
+extern SHIBSP_API const char* const    gShibSPVersionStr;
+extern SHIBSP_API const char* const    gShibSPFullVersionStr;
+extern SHIBSP_API const char* const    gShibSPDotVersionStr;
+extern SHIBSP_API const unsigned int   gShibSPMajVersion;
+extern SHIBSP_API const unsigned int   gShibSPMinVersion;
+extern SHIBSP_API const unsigned int   gShibSPRevision;
 
 // ShibSP version numeric constants that can be used for conditional
 // compilation purposes.