diff options
| -rw-r--r-- | hw/xwin/winerror.c | 11 | ||||
| -rwxr-xr-x | hw/xwin/winprocarg.c | 9 |
2 files changed, 7 insertions, 13 deletions
diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c index cb69c57c2..01412dd1d 100644 --- a/hw/xwin/winerror.c +++ b/hw/xwin/winerror.c @@ -31,10 +31,6 @@ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> #endif -#ifdef XVENDORNAME -#define VENDOR_STRING XVENDORNAME -#define VENDOR_CONTACT BUILDERADDR -#endif #include <../xfree86/common/xorgVersion.h> #include "win.h" @@ -129,11 +125,12 @@ winMessageBoxF (const char *pszError, UINT uType, ...) "%s\n" pszMsgBox = Xprintf (MESSAGEBOXF, - pszErrorF, VENDOR_STRING, + pszErrorF, XVENDORNAME, XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT, - VENDOR_CONTACT, + BUILDERADDR, BUILDERSTRING, - g_pszCommandLine); + g_pszCommandLine); + if (!pszMsgBox) goto winMessageBoxF_Cleanup; diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c index 66a0503f2..fea579763 100755 --- a/hw/xwin/winprocarg.c +++ b/hw/xwin/winprocarg.c @@ -30,10 +30,7 @@ from The Open Group. #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> #endif -#ifdef XVENDORNAME -#define VENDOR_STRING XVENDORNAME -#define VENDOR_CONTACT BUILDERADDR -#endif + #include <../xfree86/common/xorgVersion.h> #include "win.h" #include "winconfig.h" @@ -1248,10 +1245,10 @@ winLogVersionInfo (void) s_fBeenHere = TRUE; ErrorF ("Welcome to the XWin X Server\n"); - ErrorF ("Vendor: %s\n", VENDOR_STRING); + ErrorF ("Vendor: %s\n", XVENDORNAME); ErrorF ("Release: %d.%d.%d.%d (%d)\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT); ErrorF ("%s\n\n", BUILDERSTRING); - ErrorF ("Contact: %s\n", VENDOR_CONTACT); + ErrorF ("Contact: %s\n", BUILDERADDR); } /* |