Fix two thinkos caught by the cppcheck script.

[lyx.git] / src / version.h

diff --git a/src/version.h b/src/version.h
index 28c9ad0f0caa573479a9d62bd33515cf4158f466..ab712d5875f0c5f9c2b85ec63193b78e434f2adf 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -15,7 +15,7 @@
 //namespace lyx {
 
 ///About dialog, inset info, export headers
-extern char const * lyx_version;
+extern char const * const lyx_version;
 //.lyx header. We don't want lyx_version because of VCS conflicts.
 extern const int lyx_version_major;
 extern const int lyx_version_minor;
@@ -28,6 +28,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 474 // rgh: dummy format change for Chunk switch
+#define LYX_FORMAT_TEX2LYX 474
+
+#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