avoid float-conversion warning and simplify size computation

[lyx.git] / src / version.h

diff --git a/src/version.h b/src/version.h
index 83ce3e4b726f46d5d8b09f3c3de476f0bac4be30..6b80b599dcff84a8980e159517846323ee3df803 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -20,6 +20,8 @@ extern char const * const lyx_version;
 extern const int lyx_version_major;
 extern const int lyx_version_minor;
 ///
+extern char const * const lyx_git_commit_hash;
+///
 extern char const * const lyx_release_date;
 
 /// Package identifier (lyx[-<version-suffix>])
@@ -30,13 +32,19 @@ extern char const * const lyx_version_info;
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 428 // uwestoehr: rotated table cells
-#define LYX_FORMAT_TEX2LYX 428 // uwestoehr: rotated table cells
+#define LYX_FORMAT_LYX 493 // gb math multicolumn
+#define LYX_FORMAT_TEX2LYX 493
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
+#ifndef _MSC_VER
 #warning "tex2lyx produces an out of date file format."
 #warning "Please update tex2lyx as soon as possible, since it depends implicitly"
 #warning "on the current file format in some places (this causes bugs like #7780)."
+#else
+#pragma message("warning: tex2lyx produces an out of date file format. " \
+       "Please update tex2lyx as soon as possible, since it depends implicitly " \
+       "on the current file format in some places (this causes bugs like #7780).")
+#endif
 #endif
 
 //} // namespace lyx