diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/gtkclass.c | 18 | ||||
| -rw-r--r-- | src/tools/my_cpuid.c | 4 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/tools/gtkclass.c b/src/tools/gtkclass.c index 569f346c..d9700a7e 100644 --- a/src/tools/gtkclass.c +++ b/src/tools/gtkclass.c @@ -4543,7 +4543,7 @@ static void wrapGTKClass(void* cl, size_t type) GTKCLASSES() if(type==8) {} // GInterface have no structure else { - if(my_MetaFrames2==-1 && !strcmp(g_type_name(type), "MetaFrames")) { + if(my_MetaFrames2==(size_t)-1 && !strcmp(g_type_name(type), "MetaFrames")) { my_MetaFrames2 = type; wrapMetaFrames2Class((my_MetaFrames2Class_t*)cl); } else @@ -4781,7 +4781,7 @@ void* wrapCopyGTKClass(void* klass, size_t type) GTKCLASSES() if(type==8) {} // GInterface have no structure else { - if(my_MetaFrames2==-1 && !strcmp(g_type_name(type), "MetaFrames")) { + if(my_MetaFrames2==(size_t)-1 && !strcmp(g_type_name(type), "MetaFrames")) { my_MetaFrames2 = type; sz = sizeof(my_MetaFrames2Class_t); } else { @@ -4791,6 +4791,7 @@ void* wrapCopyGTKClass(void* klass, size_t type) } #undef GTKIFACE #undef GTKCLASS + (void)sz; bridgeGTKClass(klass, type); return klass; } @@ -4811,7 +4812,7 @@ void* wrapCopyGTKInterface(void* iface, size_t type) GTKCLASSES() if(type==8) {} // GInterface have no structure else { - if(my_MetaFrames2==-1 && !strcmp(g_type_name(type), "MetaFrames")) { + if(my_MetaFrames2==(size_t)-1 && !strcmp(g_type_name(type), "MetaFrames")) { my_MetaFrames2 = type; sz = sizeof(my_MetaFrames2Class_t); } else { @@ -4821,6 +4822,7 @@ void* wrapCopyGTKInterface(void* iface, size_t type) } #undef GTKIFACE #undef GTKCLASS + (void)sz; bridgeGTKInterface(iface, type); return iface; } @@ -5455,11 +5457,11 @@ void AutoBridgeGtk(void*(*ref)(size_t), void(*unref)(void*)) { void* p; #define GTKIFACE(A) - #define GTKCLASS(A) \ - if(my_##A && my_##A!=-1) { \ - p = ref(my_##A); \ - bridgeGTKClass(p, my_##A); \ - unref(p); \ + #define GTKCLASS(A) \ + if(my_##A && my_##A!=(size_t)-1) { \ + p = ref(my_##A); \ + bridgeGTKClass(p, my_##A); \ + unref(p); \ } GTKCLASSES() #undef GTKIFACE diff --git a/src/tools/my_cpuid.c b/src/tools/my_cpuid.c index 5352d0cf..7ee95ff0 100644 --- a/src/tools/my_cpuid.c +++ b/src/tools/my_cpuid.c @@ -56,13 +56,13 @@ static double bogoMips = 100.; void grabNCpu() { nCPU = 1; // default number of CPU to 1 FILE *f = fopen("/proc/cpuinfo", "r"); - size_t dummy; + ssize_t dummy; if(f) { nCPU = 0; int bogo = 0; size_t len = 500; char* line = malloc(len); - while ((dummy = getline(&line, &len, f)) != -1) { + while ((dummy = getline(&line, &len, f)) != (ssize_t)-1) { if(!strncmp(line, "processor\t", strlen("processor\t"))) ++nCPU; if(!bogo && !strncmp(line, "BogoMIPS\t", strlen("BogoMIPS\t"))) { |