diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-06-21 13:31:13 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-06-21 20:31:53 +0000 |
| commit | 73c7addfa653788c6555163a35775c441f8d0958 (patch) | |
| tree | e1961bb12c46ddb6556472f9477e7d9488b0a85e /version_info.c | |
| parent | 3c96970544b7fe8c83f05499197fb5fa4f5fd8be (diff) | |
Move the routine to get memory information to wsutil.
Change-Id: I94717cec5a464166585b258a83f8ccdaccf8d5ff
Reviewed-on: https://code.wireshark.org/review/2525
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'version_info.c')
| -rw-r--r-- | version_info.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/version_info.c b/version_info.c index 763a122038..f7376505a0 100644 --- a/version_info.c +++ b/version_info.c @@ -36,10 +36,11 @@ #include <wsutil/os_version_info.h> #include <wsutil/compiler_info.h> #include <wsutil/cpu_info.h> +#include <wsutil/mem_info.h> #include "version.h" -#ifdef HAVE_WINDOWS_H +#ifdef _WIN32 #include <windows.h> #endif @@ -168,19 +169,6 @@ get_compiled_version_info(GString *str, void (*prepend_info)(GString *), end_string(str); } -static void get_mem_info(GString *str _U_) -{ -#if defined(_WIN32) - MEMORYSTATUSEX statex; - - statex.dwLength = sizeof (statex); - - if(GlobalMemoryStatusEx (&statex)) - g_string_append_printf(str, ", with ""%" G_GINT64_MODIFIER "d" "MB of physical memory.\n", statex.ullTotalPhys/(1024*1024)); -#endif - -} - /* * Get various library run-time versions, and the OS version, and append * them to the specified GString. |