diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-07-03 08:09:46 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-07-03 15:10:25 +0000 |
| commit | f3c62edc7738f30f5ccf3861e4839539fd558367 (patch) | |
| tree | b69bd852c0c263facdc2f575e7b66dfe32eef2da /version_info.c | |
| parent | 87cf0433cceb1b4e6e726ca236d11985e4e9f15c (diff) | |
Move the GLib version info string stuff to get_glib_version_info().
Change-Id: I1013ad9a0a98bcbf07fe597f9e932f2ea1a5cd28
Reviewed-on: https://code.wireshark.org/review/2818
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'version_info.c')
| -rw-r--r-- | version_info.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/version_info.c b/version_info.c index 860fd171c9..537ecceddf 100644 --- a/version_info.c +++ b/version_info.c @@ -33,6 +33,7 @@ #include "version_info.h" #include "capture-pcap-util.h" +#include <wsutil/glib_version_info.h> #include <wsutil/os_version_info.h> #include <wsutil/compiler_info.h> #include <wsutil/cpu_info.h> @@ -95,15 +96,7 @@ get_compiled_version_info(GString *str, void (*prepend_info)(GString *), g_string_append(str, ", "); } - /* GLIB */ - g_string_append(str, "with "); - g_string_append_printf(str, -#ifdef GLIB_MAJOR_VERSION - "GLib %d.%d.%d", GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, - GLIB_MICRO_VERSION); -#else - "GLib (version unknown)"); -#endif + get_glib_version_info(str); /* Additional application-dependent information */ if (append_info) |