Mercurial > emacs
comparison src/xterm.h @ 85874:719d22550d12
Remove HAVE_X11R5 and HAVE_X11R4.
author | Jan Djärv <jan.h.d@swipnet.se> |
---|---|
date | Thu, 01 Nov 2007 07:41:34 +0000 |
parents | 4f5a9f3d91ae |
children | 3408ab8b4152 880960b70474 |
comparison
equal
deleted
inserted
replaced
85873:7a9adada4ddd | 85874:719d22550d12 |
---|---|
57 #endif /* USE_GTK */ | 57 #endif /* USE_GTK */ |
58 | 58 |
59 | 59 |
60 /* Bookkeeping to distinguish X versions. */ | 60 /* Bookkeeping to distinguish X versions. */ |
61 | 61 |
62 /* HAVE_X11R4 is defined if we have the features of X11R4. It should | |
63 be defined when we're using X11R5, since X11R5 has the features of | |
64 X11R4. If, in the future, we find we need more of these flags | |
65 (HAVE_X11R5, for example), code should always be written to test | |
66 the most recent flag first: | |
67 | |
68 #ifdef HAVE_X11R5 | |
69 ... | |
70 #elif HAVE_X11R4 | |
71 ... | |
72 #elif HAVE_X11 | |
73 ... | |
74 #endif | |
75 | |
76 If you ever find yourself writing a "#ifdef HAVE_FOO" clause that | |
77 looks a lot like another one, consider moving the text into a macro | |
78 whose definition is configuration-dependent, but whose usage is | |
79 universal - like the stuff in systime.h. | |
80 | |
81 It turns out that we can auto-detect whether we're being compiled | |
82 with X11R3 or X11R4 by looking for the flag macros for R4 structure | |
83 members that R3 doesn't have. */ | |
84 #ifdef PBaseSize | |
85 /* AIX 3.1's X is somewhere between X11R3 and X11R4. It has | |
86 PBaseSize, but not XWithdrawWindow, XSetWMName, XSetWMNormalHints, | |
87 XSetWMIconName. | |
88 AIX 3.2 is at least X11R4. */ | |
89 #if (!defined AIX) || (defined AIX3_2) | |
90 #define HAVE_X11R4 | |
91 #endif | |
92 #endif | |
93 | |
94 #ifdef HAVE_X11R5 | |
95 /* In case someone has X11R5 on AIX 3.1, | |
96 make sure HAVE_X11R4 is defined as well as HAVE_X11R5. */ | |
97 #define HAVE_X11R4 | |
98 #endif | |
99 | 62 |
100 #ifdef HAVE_X_I18N | 63 #ifdef HAVE_X_I18N |
101 #include <X11/Xlocale.h> | 64 #include <X11/Xlocale.h> |
102 #endif | 65 #endif |
103 | 66 |