diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-06-20 21:10:18 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-06-20 21:10:18 +0000 |
| commit | 874ff29b40372ea0d1ed338ae27a7b5a2df37579 (patch) | |
| tree | 49f905659b950384bcc9df7925103ab7e09effce /version_info.c | |
| parent | e6a902eb768afa8d024625b4429ffc240a66cd57 (diff) | |
Fix warning about CPUInfo in Linux (when use qmake to build qtshark)
../../version_info.c: In function 'get_cpu_info':
../../version_info.c:662:5: warning: pointer targets in passing argument 1 of 'do_cpuid' differ in signedness [-Wpointer-sign]
../../version_info.c:622:1: note: expected 'guint32 *' but argument is of type 'int *'
../../version_info.c:670:5: warning: pointer targets in passing argument 1 of 'do_cpuid' differ in signedness [-Wpointer-sign]
../../version_info.c:622:1: note: expected 'guint32 *' but argument is of type 'int *'
../../version_info.c:672:5: warning: pointer targets in passing argument 1 of 'do_cpuid' differ in signedness [-Wpointer-sign]
../../version_info.c:622:1: note: expected 'guint32 *' but argument is of type 'int *'
../../version_info.c:674:5: warning: pointer targets in passing argument 1 of 'do_cpuid' differ in signedness [-Wpointer-sign]
../../version_info.c:622:1: note: expected 'guint32 *' but argument is of type 'int *'
svn path=/trunk/; revision=50087
Diffstat (limited to 'version_info.c')
| -rw-r--r-- | version_info.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/version_info.c b/version_info.c index 2747515ad1..475472a3c2 100644 --- a/version_info.c +++ b/version_info.c @@ -651,7 +651,11 @@ do_cpuid(guint32 *CPUInfo, int selector _U_){ static void get_cpu_info(GString *str _U_) { - int CPUInfo[4]; +#if defined(_MSC_VER) + int CPUInfo[4]; +#else + guint32 CPUInfo[4]; +#endif char CPUBrandString[0x40]; unsigned nExIds; |