We don't need to crash here, but can try to continue in release

[lyx.git] / src / version.h

diff --git a/src/version.h b/src/version.h
index 1d65845488686b33bfa1773dc0c78b442ded4e63..561f3ec56a5a994fa3ff491aefb568afa529cc90 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>])
@@ -28,6 +30,23 @@ extern char const * const lyx_package;
 /// This is the version information shown by 'lyx -version'
 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 512 // spitz: beamer article extension
+#define LYX_FORMAT_TEX2LYX 512
+
+#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
 
 #endif