summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2012-06-28 14:22:07 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2012-06-28 14:23:14 +0100
commit73b2193d2e7c2c1ed61e4374755cb621cf049176 (patch)
tree2fe7faca6bd6a96fd1497f0cfcaebd672f9ec8ca
parent42f573005cc4a0a489cd5771f5a2178cc33478b3 (diff)
Report Cygwin version information as well as native OS version
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
-rw-r--r--hw/xwin/winprocarg.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c
index a9217ed70..1b539c025 100644
--- a/hw/xwin/winprocarg.c
+++ b/hw/xwin/winprocarg.c
@@ -31,6 +31,10 @@ from The Open Group.
#include <xwin-config.h>
#endif
+#ifdef HAVE_SYS_UTSNAME_H
+#include <sys/utsname.h>
+#endif
+
#include <../xfree86/common/xorgVersion.h>
#include "win.h"
#include "winconfig.h"
@@ -1346,6 +1350,14 @@ winLogVersionInfo (void)
ErrorF ("Welcome to the XWin X Server\n");
ErrorF ("Vendor: %s\n", XVENDORNAME);
ErrorF ("Release: %d.%d.%d.%d\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP);
+#ifdef HAVE_SYS_UTSNAME_H
+ {
+ struct utsname name;
+ if (uname(&name) >= 0) {
+ ErrorF("OS: %s %s %s %s %s\n", name.sysname, name.nodename, name.release, name.version, name.machine);
+ }
+ }
+#endif
winOS();
if (strlen(BUILDERSTRING)) ErrorF ("%s\n", BUILDERSTRING);
ErrorF("\n");