summaryrefslogtreecommitdiff
path: root/src/proto.h
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2010-05-22 18:28:27 +0200
committerBram Moolenaar <bram@vim.org>2010-05-22 18:28:27 +0200
commit7135ec82140307efccc352c010459d844326ba7a (patch)
tree6459163974c9a639d3614defb9a55b690d727de7 /src/proto.h
parentcbb9718418cac87a8575c15c65e0b274974c1cf0 (diff)
downloadvim-7135ec82140307efccc352c010459d844326ba7a.tar.gz
Included the patch to support netbeans in a terminal.
Diffstat (limited to 'src/proto.h')
-rw-r--r--src/proto.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/proto.h b/src/proto.h
index dd2e1465..2b248a5e 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -181,6 +181,16 @@ void qsort __ARGS((void *base, size_t elm_count, size_t elm_size, int (*cmp)(con
# include "if_ruby.pro"
# endif
+/* Ugly solution for "BalloonEval" not being defined while it's used in some
+ * .pro files. */
+# ifndef FEAT_BEVAL
+# define BalloonEval int
+# endif
+
+# ifdef FEAT_NETBEANS_INTG
+# include "netbeans.pro"
+# endif
+
# ifdef FEAT_GUI
# include "gui.pro"
# if defined(UNIX) || defined(MACOS)
@@ -195,11 +205,6 @@ extern char_u *vimpty_getenv __ARGS((const char_u *string)); /* from pty.c */
# ifdef FEAT_GUI_W16
# include "gui_w16.pro"
# endif
- /* Ugly solution for "BalloonEval" not being defined while it's used in
- * the prototypes. */
-# ifndef FEAT_BEVAL
-# define BalloonEval int
-# endif
# ifdef FEAT_GUI_W32
# include "gui_w32.pro"
# endif
@@ -232,9 +237,6 @@ extern char *vim_SelFile __ARGS((Widget toplevel, char *prompt, char *init_path,
# ifdef FEAT_SUN_WORKSHOP
# include "workshop.pro"
# endif
-# ifdef FEAT_NETBEANS_INTG
-# include "netbeans.pro"
-# endif
# endif /* FEAT_GUI */
# ifdef FEAT_OLE