Re-convert linefeeds to undo Eclipse's handiwork

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

diff --git a/shibsp/version.h b/shibsp/version.h
index 17ab6e3..4440a51 100644 (file)
--- a/shibsp/version.h
+++ b/shibsp/version.h
@@ -1,23 +1,27 @@
-/*
- *  Copyright 2001-2007 Internet2
- * 
- * 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
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID 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
  *
- *     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,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /**
  * version.h
- * 
- * Library version macros and constants 
+ *
+ * Library version macros and constants.
  */
 
 #ifndef __shibsp_version_h__
@@ -27,19 +31,20 @@
 // 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>
 
 // ---------------------------------------------------------------------------
 // V E R S I O N   S P E C I F I C A T I O N
 
 /**
- * MODIFY THESE NUMERIC VALUES TO COINCIDE WITH OPENSAML VERSION
+ * MODIFY THESE NUMERIC VALUES TO COINCIDE WITH SHIBSP LIBRARY VERSION
  * AND DO NOT MODIFY ANYTHING ELSE IN THIS VERSION HEADER FILE
  */
 
 #define SHIBSP_VERSION_MAJOR 1
-#define SHIBSP_VERSION_MINOR 0
-#define SHIBSP_VERSION_REVISION 0
+#define SHIBSP_VERSION_MINOR 5
+#define SHIBSP_VERSION_REVISION 6
 
 /** DO NOT MODIFY BELOW THIS LINE */
 
@@ -60,11 +65,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.