From 5835dbd9f65d737d3001c992f5d9bd55255a7eef Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 22 Dec 2020 01:04:28 +0700 Subject: [PATCH] Remove display name handling block ifdef'd for X11R1. (#110) X11R1 was released in 1987 and superseded by X11R2 in 1988. We should be able to safely remove this code. We set the preprocessor variable on all platforms to indicate that we're on X11R4 (or later, I guess). --- src/ldeboot.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/ldeboot.c b/src/ldeboot.c index f368db6..78e7d85 100644 --- a/src/ldeboot.c +++ b/src/ldeboot.c @@ -95,24 +95,13 @@ int main(int argc, char *argv[]) char *pos; for (i = 1; i < argc; i++) { -#ifdef XV11R1 - pos = strchr(argv[i], ':'); - if (pos != NULL) { - Display_Name = argv[i]; - continue; - } -#endif /* XV11R1 */ - -#ifndef XV11R1 if ((strcmp(argv[i], "-d") == 0) || (strcmp(argv[i], "-display") == 0)) { if (i == argc) break; pos = (char *)strchr(argv[++i], ':'); if (pos != NULL) { Display_Name = argv[i]; } continue; } -#endif /* XV11R1 */ - - } /*end for() */ + } if ((Xdisplay = XOpenDisplay(Display_Name)) != (Display *)NULL) { /* success to connect X-server */