diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-02-07 11:14:52 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-02-07 23:03:03 +0000 |
| commit | f966980937abd4899a9c43329041bb00798ab18e (patch) | |
| tree | e31210350fa778765b6d2d4711fc5cc6c27f2aae /version_info.c | |
| parent | 217f9fd0d9f2d6a9084da3fc945cce001414eea3 (diff) | |
Replace "svn" with "git" all over the place.
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate.
Rename "svnversion.h" to "version.h" as Evan suggested. Update some
URLs. In make-version.pl, make sure we don't set an improper upstream
branch name. Use the number of commits + short hash from `git describe`
for package names by default.
Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96
Reviewed-on: https://code.wireshark.org/review/139
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'version_info.c')
| -rw-r--r-- | version_info.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/version_info.c b/version_info.c index 15c5612db2..82609373f6 100644 --- a/version_info.c +++ b/version_info.c @@ -43,7 +43,7 @@ #include "capture-pcap-util.h" #include <wsutil/unicode-utils.h> -#include "svnversion.h" +#include "version.h" #ifdef HAVE_WINDOWS_H #include <windows.h> @@ -58,10 +58,10 @@ # include <sys/capability.h> #endif -#ifdef SVNVERSION - const char *wireshark_svnversion = " (" SVNVERSION " from " SVNPATH ")"; +#ifdef GITVERSION + const char *wireshark_gitversion = " (" GITVERSION " from " GITBRANCH ")"; #else - const char *wireshark_svnversion = ""; + const char *wireshark_gitversion = ""; #endif /* @@ -626,7 +626,7 @@ do_cpuid(int *CPUInfo, guint32 selector){ __cpuid(CPUInfo, selector); } #elif defined(__GNUC__) -#if defined(__x86_64__) +#if defined(__x86_64__) static inline void do_cpuid(guint32 *CPUInfo, int selector) { @@ -697,7 +697,7 @@ static void get_mem_info(GString *str _U_) 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 |