X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..8add533eb22ba0756f5b426f77ee593bc1aa6fcd:/src/unix/baseunix.cpp?ds=sidebyside diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp index 0b03067e58..d77d5891bd 100644 --- a/src/unix/baseunix.cpp +++ b/src/unix/baseunix.cpp @@ -92,11 +92,24 @@ wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo() { static wxToolkitInfo info; int major, minor; - char name[256]; - if ( sscanf(WXWIN_OS_DESCRIPTION, "%255s %d.%d", name, &major, &minor) != 3 ) + FILE *f = popen("uname -r", "r"); + if (f) { - // unreckognized uname string format + char buf[32]; + size_t c = fread(buf, 1, sizeof(buf) - 1, f); + pclose(f); + buf[c] = '\0'; + if ( sscanf(buf, "%d.%d", &major, &minor) != 2 ) + { + // unrecognized uname string format + major = + minor = -1; + } + } + else + { + // failed to run uname major = minor = -1; }