Fix build by #if 0 out unused de_sgsap_tmsi() function.

[obnox/wireshark/wip.git] / version_info.h

diff --git a/version_info.h b/version_info.h
index 421a9bef6575382d305a7d257cce7d126b75e060..0d85d17a5b358f11b03b940ef9721de14374517d 100644 (file)
--- a/version_info.h
+++ b/version_info.h
@@ -33,25 +33,23 @@ extern "C" {
 /*
  * The svn version string or ""
  */
-const gchar *svnversion;
+extern const gchar *wireshark_svnversion;
 
 /*
  * Get various library compile-time versions and append them to
  * the specified GString.
  *
- * "additional_info" is called at the end to append any additional
+ * "prepend_info" is called at the start to prepend any additional
+ * information.
+ *
+ * "append_info" is called at the end to append any additional
  * information; this is required in order to, for example, put the
  * Portaudio information at the end of the string, as we currently
  * don't use Portaudio in TShark.
  */
 void get_compiled_version_info(GString *str,
-    void (*additional_info)(GString *));
-
-/*
- * Get compile-time information used only by applications that use
- * libethereal.
- */
-void get_epan_compiled_version_info(GString *str);
+    void (*prepend_info)(GString *),
+    void (*append_info)(GString *));
 
 /*
  * Get various library run-time versions, and the OS version, and append
@@ -65,6 +63,13 @@ void get_runtime_version_info(GString *str,
  */
 const char *get_copyright_info(void);
 
+#if defined(_WIN32)
+/*
+ * Get the major OS version.
+ */
+guint32 get_os_major_version();
+#endif
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */