diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-03-23 16:34:26 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-10-19 14:02:33 +0100 |
| commit | 9f8f056a21b9480fd9fd43a22c9d6f45a2c1ef87 (patch) | |
| tree | e4e8ca64029e685a30574298a02876643700a327 /hw/xwin/winerror.c | |
| parent | 5aff712a8d2eb9f965ecbb93216cc0bcdc327ae6 (diff) | |
Cygwin/X: Cleanup some VENDOR_STRING/VENDOR_CONTACT cruft
Cleanup some VENDOR_STRING/VENDOR_CONTACT cruft
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Diffstat (limited to 'hw/xwin/winerror.c')
| -rw-r--r-- | hw/xwin/winerror.c | 11 |
1 files changed, 4 insertions, 7 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; |