From 4c7da861185080d15b3ff4301af4af0e85a71f93 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 4 Apr 2006 14:17:04 +0000 Subject: [PATCH] Bug #5300: Fix missing spaces in the Build OS line in the log. (Egmont Koblinger) --- ChangeLog | 7 +++++++ hw/darwin/darwin.c | 4 ++-- hw/xfree86/common/xf86Init.c | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7816d6ecb..667559a9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-04-04 Adam Jackson + + * hw/darwin/darwin.c: + * hw/xfree86/common/xf86Init.c: + Bug #5300: Fix missing spaces in the Build OS line in the log. + (Egmont Koblinger) + 3006-04-04 Adam Jackson * hw/xfree86/ddc/print_edid.c: diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c index fe8cd2fd8..10afbaf78 100644 --- a/hw/darwin/darwin.c +++ b/hw/darwin/darwin.c @@ -29,7 +29,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/darwin.c,v 1.6 2005/04/20 12:25:19 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/hw/darwin/darwin.c,v 1.8 2005/07/03 08:53:38 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.55 2003/11/15 00:07:09 torrey Exp $ */ #include @@ -155,7 +155,7 @@ DarwinPrintBanner() ErrorF("\nRelease Date: %s\n", XF86_DATE); ErrorF("X Protocol Version %d, Revision %d, %s\n", X_PROTOCOL, X_PROTOCOL_REVISION, XORG_RELEASE ); - ErrorF("Build Operating System:%s%s\n", OSNAME, OSVENDOR); + ErrorF("Build Operating System: %s %s\n", OSNAME, OSVENDOR); #ifdef HAS_UTSNAME { struct utsname name; diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 30431a3f0..d5741aa94 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -1,5 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.212 2004/01/27 01:31:45 dawes Exp $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Init.c,v 1.32 2006/03/20 14:01:05 ajax Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Init.c,v 1.33 2006/03/25 19:52:03 ajax Exp $ */ /* * Loosely based on code bearing the following copyright: @@ -1829,7 +1829,7 @@ xf86PrintBanner() ErrorF("\nRelease Date: %s\n", XORG_DATE); ErrorF("X Protocol Version %d, Revision %d, %s\n", X_PROTOCOL, X_PROTOCOL_REVISION, XORG_RELEASE ); - ErrorF("Build Operating System:%s%s\n", OSNAME, OSVENDOR); + ErrorF("Build Operating System: %s %s\n", OSNAME, OSVENDOR); #ifdef HAS_UTSNAME { struct utsname name;