From Harald Welte:

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

diff --git a/version_info.h b/version_info.h
index 565ca44f0a765805662e47de71fe3c288a73973d..0d85d17a5b358f11b03b940ef9721de14374517d 100644 (file)
--- a/version_info.h
+++ b/version_info.h
@@ -33,31 +33,43 @@ 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 *));
+    void (*prepend_info)(GString *),
+    void (*append_info)(GString *));
 
 /*
  * Get various library run-time versions, and the OS version, and append
  * them to the specified GString.
  */
-void get_runtime_version_info(GString *str);
+void get_runtime_version_info(GString *str,
+    void (*additional_info)(GString *));
 
 /*
  * Get copyright information.
  */
 const char *get_copyright_info(void);
 
+#if defined(_WIN32)
+/*
+ * Get the major OS version.
+ */
+guint32 get_os_major_version();
+#endif
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */