summaryrefslogtreecommitdiff
path: root/src/xterm.h
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2007-11-01 07:42:19 +0000
committerJan Djärv <jan.h.d@swipnet.se>2007-11-01 07:42:19 +0000
commitac1278c1f0467600aae57ee5e33e4ca09b742585 (patch)
tree5ee9a200237c132798671dcd84bd9cf77e2b0e72 /src/xterm.h
parent00b9439af40f5ad5c9dc5e32ff10f41249525f0a (diff)
downloademacs-ac1278c1f0467600aae57ee5e33e4ca09b742585.tar.gz
Remove HAVE_X11R5 and HAVE_X11R4.
Diffstat (limited to 'src/xterm.h')
-rw-r--r--src/xterm.h37
1 files changed, 0 insertions, 37 deletions
diff --git a/src/xterm.h b/src/xterm.h
index 081a9c42343..741dec13e75 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -59,43 +59,6 @@ typedef GtkWidget *xt_or_gtk_widget;
/* Bookkeeping to distinguish X versions. */
-/* HAVE_X11R4 is defined if we have the features of X11R4. It should
- be defined when we're using X11R5, since X11R5 has the features of
- X11R4. If, in the future, we find we need more of these flags
- (HAVE_X11R5, for example), code should always be written to test
- the most recent flag first:
-
- #ifdef HAVE_X11R5
- ...
- #elif HAVE_X11R4
- ...
- #elif HAVE_X11
- ...
- #endif
-
- If you ever find yourself writing a "#ifdef HAVE_FOO" clause that
- looks a lot like another one, consider moving the text into a macro
- whose definition is configuration-dependent, but whose usage is
- universal - like the stuff in systime.h.
-
- It turns out that we can auto-detect whether we're being compiled
- with X11R3 or X11R4 by looking for the flag macros for R4 structure
- members that R3 doesn't have. */
-#ifdef PBaseSize
-/* AIX 3.1's X is somewhere between X11R3 and X11R4. It has
- PBaseSize, but not XWithdrawWindow, XSetWMName, XSetWMNormalHints,
- XSetWMIconName.
- AIX 3.2 is at least X11R4. */
-#if (!defined AIX) || (defined AIX3_2)
-#define HAVE_X11R4
-#endif
-#endif
-
-#ifdef HAVE_X11R5
-/* In case someone has X11R5 on AIX 3.1,
- make sure HAVE_X11R4 is defined as well as HAVE_X11R5. */
-#define HAVE_X11R4
-#endif
#ifdef HAVE_X_I18N
#include <X11/Xlocale.h>