Author: cazfi
Date: Fri Apr  8 15:27:22 2016
New Revision: 32324

URL: http://svn.gna.org/viewcvs/freeciv?rev=32324&view=rev
Log:
Fixed static assert failure when the minor version number is not one of major 
version bump development version.

See bug #24555

Modified:
    trunk/client/options.c

Modified: trunk/client/options.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/options.c?rev=32324&r1=32323&r2=32324&view=diff
==============================================================================
--- trunk/client/options.c      (original)
+++ trunk/client/options.c      Fri Apr  8 15:27:22 2016
@@ -5134,7 +5134,11 @@
     6   /* 2.6 */
   };
 
+#if MINOR_VERSION >= 90
   FC_STATIC_ASSERT(MAJOR_VERSION < sizeof(last_minors) / sizeof(int), 
missing_last_minor);
+#else
+  FC_STATIC_ASSERT(MAJOR_VERSION <= sizeof(last_minors) / sizeof(int), 
missing_last_minor);
+#endif
 
   *allow_digital_boolean = FALSE;
   name = getenv("FREECIV_OPT");


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

Reply via email to