diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-02-20 21:17:43 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-02-20 21:17:43 +0000 |
| commit | 29a14da1887360fedb12be48d4eca3aa265742f8 (patch) | |
| tree | 42225066d54879665a1a5926efb2182cd253be49 /version_info.c | |
| parent | b3e893b1d1ef52de4ace0d460066adbd1dee55fb (diff) | |
Jose Pedro Oliveira: get_os_version_info() is more apropriate for shb_os
svn path=/trunk/; revision=41086
Diffstat (limited to 'version_info.c')
| -rw-r--r-- | version_info.c | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/version_info.c b/version_info.c index 887b9836dc..51ae5dd95a 100644 --- a/version_info.c +++ b/version_info.c @@ -167,11 +167,9 @@ typedef void (WINAPI *nativesi_func_ptr)(LPSYSTEM_INFO); #endif /* - * Get various library run-time versions, and the OS version, and append - * them to the specified GString. + * Get the OS version, and append it to the GString */ -void -get_runtime_version_info(GString *str, void (*additional_info)(GString *)) +void get_os_version_info(GString *str) { #if defined(_WIN32) OSVERSIONINFOEX info; @@ -183,11 +181,6 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *)) #if HAVE_OS_X_FRAMEWORKS SInt32 macosx_ver, macosx_major_ver, macosx_minor_ver, macosx_bugfix_ver; #endif -#ifndef _WIN32 - gchar *lang; -#endif - - g_string_append(str, "on "); #if defined(_WIN32) /* @@ -469,6 +462,23 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *)) #else g_string_append(str, "an unknown OS"); #endif +} + + +/* + * 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 (*additional_info)(GString *)) +{ +#ifndef _WIN32 + gchar *lang; +#endif + + g_string_append(str, "on "); + + get_os_version_info(str); #ifndef _WIN32 /* Locale */ |