diff options
| -rw-r--r-- | winsup/utils/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/utils/cygcheck.cc | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 781fafbea..809e57bd5 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,7 @@ +2001-11-12 Corinna Vinschen <corinna@vinschen.de> + + * cygcheck.cc (dump_sysinfo): Redefine output format slightly. + 2001-11-12 Christopher Faylor <cgf@redhat.com> * cygcheck.cc (main): Slight formatting tweak. diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc index 66bf51855..259257aea 100644 --- a/winsup/utils/cygcheck.cc +++ b/winsup/utils/cygcheck.cc @@ -847,9 +847,12 @@ dump_sysinfo () osname = (char *) "??"; break; } - printf ("Windows %s Ver %d.%d build %d %s\n\n", osname, - (int) osversion.dwMajorVersion, (int) osversion.dwMinorVersion, - (int) osversion.dwBuildNumber, osversion.szCSDVersion); + printf ("Windows %s Ver %lu.%lu Build %lu %s\n\n", osname, + osversion.dwMajorVersion, osversion.dwMinorVersion, + osversion.dwPlatformId == VER_PLATFORM_WIN32_NT ? + osversion.dwBuildNumber : (osversion.dwBuildNumber & 0xffff), + osversion.dwPlatformId == VER_PLATFORM_WIN32_NT ? + osversion.szCSDVersion : ""); printf ("Path:"); char *s = getenv ("PATH"), *e; |