Mercurial > vim

comparison src/vim.h @ 18:293621502c4d v7.0010

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0010
author vimboss
date Sun, 18 Jul 2004 21:34:53 +0000
parents 946da5994c01
children 3f44e9abe4ec
comparison
equal deleted inserted replaced
17:9be87deaeb52 18:293621502c4d
89 || defined(FEAT_GUI_W16) \ 89 || defined(FEAT_GUI_W16) \
90 || defined(FEAT_GUI_BEOS) \ 90 || defined(FEAT_GUI_BEOS) \
91 || defined(FEAT_GUI_AMIGA) \ 91 || defined(FEAT_GUI_AMIGA) \
92 || defined(FEAT_GUI_PHOTON) \ 92 || defined(FEAT_GUI_PHOTON) \
93 || defined(FEAT_GUI_KDE) 93 || defined(FEAT_GUI_KDE)
94 # ifndef FEAT_GUI 94 # if !defined(FEAT_GUI) && !defined(NO_X11_INCLUDES)
95 # define FEAT_GUI 95 # define FEAT_GUI
96 # endif 96 # endif
97 #endif 97 #endif
98 98
99 #if defined(FEAT_GUI_W32) || defined(FEAT_GUI_W16) 99 #if defined(FEAT_GUI_W32) || defined(FEAT_GUI_W16)
156 #include "feature.h" /* #defines for optionals and features */ 156 #include "feature.h" /* #defines for optionals and features */
157 157
158 /* +x11 is only enabled when it's both available and wanted. */ 158 /* +x11 is only enabled when it's both available and wanted. */
159 #if defined(HAVE_X11) && defined(WANT_X11) 159 #if defined(HAVE_X11) && defined(WANT_X11)
160 # define FEAT_X11 160 # define FEAT_X11
161 #endif
162
163 #ifdef NO_X11_INCLUDES
164 /* In os_mac_conv.c NO_X11_INCLUDES is defined to avoid X11 headers.
165 * Disable all X11 related things to avoid conflicts. */
166 # ifdef FEAT_X11
167 # undef FEAT_X11
168 # endif
169 # ifdef FEAT_XCLIPBOARD
170 # undef FEAT_XCLIPBOARD
171 # endif
172 # ifdef FEAT_GUI_MOTIF
173 # undef FEAT_GUI_MOTIF
174 # endif
175 # ifdef FEAT_GUI_ATHENA
176 # undef FEAT_GUI_ATHENA
177 # endif
178 # ifdef FEAT_GUI_GTK
179 # undef FEAT_GUI_GTK
180 # endif
181 # ifdef FEAT_BEVAL_TIP
182 # undef FEAT_BEVAL_TIP
183 # endif
184 # ifdef FEAT_XIM
185 # undef FEAT_XIM
186 # endif
187 # ifdef FEAT_CLIENTSERVER
188 # undef FEAT_CLIENTSERVER
189 # endif
161 #endif 190 #endif
162 191
163 /* Can't use "PACKAGE" here, conflicts with a Perl include file. */ 192 /* Can't use "PACKAGE" here, conflicts with a Perl include file. */
164 #ifndef VIMPACKAGE 193 #ifndef VIMPACKAGE
165 # define VIMPACKAGE "vim" 194 # define VIMPACKAGE "vim"