diff --git a/rosapps/applications/devutils/symdump/symdump.c b/rosapps/applications/devutils/symdump/symdump.c index 22b1a0e4f0c..bd56edd6aaa 100644 --- a/rosapps/applications/devutils/symdump/symdump.c +++ b/rosapps/applications/devutils/symdump/symdump.c @@ -875,7 +875,12 @@ EnumSymbolsProc( } else { +#if defined(__GNUC__) && \ + (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40400) + printf("Symbol: %s, TypeIndex=%ld, Flags=%lx, Value=0x%llx\n", +#else printf("Symbol: %s, TypeIndex=%ld, Flags=%lx, Value=0x%I64x\n", +#endif pSymInfo->Name, pSymInfo->TypeIndex, pSymInfo->Flags, pSymInfo->Value); //if (pSymInfo->Flags & SYMFLAG_FUNCTION) { diff --git a/rosapps/applications/devutils/syscalldump/syscalldump.c b/rosapps/applications/devutils/syscalldump/syscalldump.c index bd160ff87e5..0407e685cbe 100644 --- a/rosapps/applications/devutils/syscalldump/syscalldump.c +++ b/rosapps/applications/devutils/syscalldump/syscalldump.c @@ -36,7 +36,12 @@ ImageSymToVa(HANDLE hProcess, PSYMBOL_INFO pSym, PBYTE pModule, PCSTR Name) printf("SymGetSymFromName64() failed: %ld\n", GetLastError()); return 0; } +#if defined(__GNUC__) && \ + (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40400) + printf("looking up adress for %s: 0x%llx\n", Name, pSym->Address); +#else printf("looking up adress for %s: 0x%I64x\n", Name, pSym->Address); +#endif NtHeaders = ImageNtHeader(pModule); p = ImageRvaToVa(NtHeaders, pModule, pSym->Address - pSym->ModBase, NULL); diff --git a/rosapps/applications/sysutils/systeminfo/systeminfo.c b/rosapps/applications/sysutils/systeminfo/systeminfo.c index ea13782a28d..d641c200da0 100644 --- a/rosapps/applications/sysutils/systeminfo/systeminfo.c +++ b/rosapps/applications/sysutils/systeminfo/systeminfo.c @@ -358,8 +358,7 @@ AllSysInfo(VOID) int main(int argc, char *argv[]) { - char str[] = "/?"; - if (argc > 1 && !strcmp(argv[1], str)) + if (argc > 1 && !strcmp(argv[1], "/?")) { Usage(); return 0;