X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fversion.h;h=0aee452a278c6f6a7d197dd466525ed9717c63ee;hb=3d4076b598deb18660e50ec9c327efc3b15f15d0;hp=a779496c890880e60c313b6ff155d91f20a533cb;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/version.h b/src/version.h
index a779496c89..0aee452a27 100644
--- a/src/version.h
+++ b/src/version.h
@@ -12,12 +12,39 @@
 #ifndef VERSION_H
 #define VERSION_H
 
+//namespace lyx {
+
+///About dialog, inset info, export headers
+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;
 ///
-extern char const * lyx_version;
-///
-extern char const * lyx_release_date;
+extern char const * const lyx_release_date;
+
+/// Package identifier (lyx[-<version-suffix>])
+extern char const * const lyx_package;
 
 /// This is the version information shown by 'lyx -version'
-extern char const * lyx_version_info;
+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 469 // gb: \caption*{}
+#define LYX_FORMAT_TEX2LYX 469 // gb: \caption*{}
+
+#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