osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Alexis La Goutte 2013-06-20 21:10:18 +00:00
parent e6a902eb76
commit 874ff29b40
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
version_info.c
View File

@ -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;