Author: cazfi
Date: Wed Feb 10 20:19:18 2016
New Revision: 31867

URL: http://svn.gna.org/viewcvs/freeciv?rev=31867&view=rev
Log:
Made FREECIV_RELEASE_MONTH public in freeciv_config.h

See patch #6932

Modified:
    branches/S2_6/common/version.c
    branches/S2_6/common/version.h
    branches/S2_6/configure.ac
    branches/S2_6/gen_headers/freeciv_config.h.in

Modified: branches/S2_6/common/version.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/version.c?rev=31867&r1=31866&r2=31867&view=diff
==============================================================================
--- branches/S2_6/common/version.c      (original)
+++ branches/S2_6/common/version.c      Wed Feb 10 20:19:18 2016
@@ -147,7 +147,7 @@
     N_("December")
   };
 
-  if (RELEASE_MONTH > 0) {
+  if (FREECIV_RELEASE_MONTH > 0) {
     fc_snprintf(msgbuf, sizeof(msgbuf),
                 /* TRANS: No full stop after the URL, could cause confusion. */
                 _("THIS IS A BETA VERSION\n"
@@ -160,9 +160,9 @@
                 NEXT_STABLE_VERSION, WIKI_URL);
   }
   return msgbuf;
-#else
+#else  /* IS_BETA_VERSION */
   return NULL;
-#endif
+#endif /* IS_BETA_VERSION */
 }
 
 /***************************************************************************

Modified: branches/S2_6/common/version.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/version.h?rev=31867&r1=31866&r2=31867&view=diff
==============================================================================
--- branches/S2_6/common/version.h      (original)
+++ branches/S2_6/common/version.h      Wed Feb 10 20:19:18 2016
@@ -17,16 +17,14 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#ifdef HAVE_CONFIG_H
-#ifndef FC_CONFIG_H  /* this should be defined in fc_config.h */
-#error Files including versions.h should also include fc_config.h directly
-#endif
+#if !defined(FC__FREECIV_CONFIG_H) && !defined(FC_CONFIG_H)
+#error Files including versions.h should also include freeciv_config.h directly
 #endif
 
 /* This is only used in version.c, and only if IS_BETA_VERSION is true.
    The month[] array is defined in version.c (index: 1==Jan, 2==Feb, ...). */
 #ifndef NEXT_RELEASE_MONTH
-#define NEXT_RELEASE_MONTH     (month[RELEASE_MONTH])
+#define NEXT_RELEASE_MONTH     (month[FREECIV_RELEASE_MONTH])
 #endif
 
 /* version informational strings */

Modified: branches/S2_6/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=31867&r1=31866&r2=31867&view=diff
==============================================================================
--- branches/S2_6/configure.ac  (original)
+++ branches/S2_6/configure.ac  Wed Feb 10 20:19:18 2016
@@ -48,7 +48,7 @@
 AC_DEFINE_UNQUOTED([IS_FREEZE_VERSION], [$IS_FREEZE_VERSION], [Is this a 
frozen version])
 AC_DEFINE_UNQUOTED([IS_BETA_VERSION], [$IS_BETA_VERSION], [Is this a beta 
version])
 AC_DEFINE_UNQUOTED([NEXT_STABLE_VERSION], ["$NEXT_STABLE_VERSION"], [Version 
number of next release])
-AC_DEFINE_UNQUOTED([RELEASE_MONTH], [$RELEASE_MONTH], [Month next version will 
be released])
+AC_DEFINE_UNQUOTED([FREECIV_RELEASE_MONTH], [$RELEASE_MONTH], [Month next 
version will be released])
 AC_SUBST([MAJOR_VERSION])
 AC_SUBST([MINOR_VERSION])
 

Modified: branches/S2_6/gen_headers/freeciv_config.h.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/gen_headers/freeciv_config.h.in?rev=31867&r1=31866&r2=31867&view=diff
==============================================================================
--- branches/S2_6/gen_headers/freeciv_config.h.in       (original)
+++ branches/S2_6/gen_headers/freeciv_config.h.in       Wed Feb 10 20:19:18 2016
@@ -25,6 +25,9 @@
 
 /* Metaserver URL */
 #undef FREECIV_META_URL
+
+/* Month next version will be released */
+#undef FREECIV_RELEASE_MONTH
 
 /* Use pthreads as thread implementation */
 #undef FREECIV_HAVE_PTHREAD


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to