aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Coleman <metrix1978@gmail.com>2014-06-17 00:13:35 -0500
committerNicolas Hillegeer <nicolas@hillegeer.com>2014-07-09 00:18:17 +0200
commite3db6365467bf6087e5eced3bce3969ff975a864 (patch)
tree9802b856c6f4e31323b7ba7a55769c1dbf9ac238
parenta568e8b644a41b12388b7c7de4ca0fb8dc107f18 (diff)
downloadrneovim-e3db6365467bf6087e5eced3bce3969ff975a864.tar.gz
rneovim-e3db6365467bf6087e5eced3bce3969ff975a864.tar.bz2
rneovim-e3db6365467bf6087e5eced3bce3969ff975a864.zip
remove proto.h include from vim.h
-rw-r--r--src/nvim/proto.h49
-rw-r--r--src/nvim/vim.h1
2 files changed, 0 insertions, 50 deletions
diff --git a/src/nvim/proto.h b/src/nvim/proto.h
deleted file mode 100644
index d628e1f998..0000000000
--- a/src/nvim/proto.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef NVIM_PROTO_H
-#define NVIM_PROTO_H
-
-/*
- * VIM - Vi IMproved by Bram Moolenaar
- *
- * Do ":help uganda" in Vim to read copying and usage conditions.
- * Do ":help credits" in Vim to see a list of people who contributed.
- */
-
-/*
- * proto.h: include the (automatically generated) function prototypes
- */
-
-/*
- * Don't include these while generating prototypes. Prevents problems when
- * files are missing.
- */
-#if !defined(PROTO) && !defined(NOPROTO)
-
-/*
- * Machine-dependent routines.
- */
-/* avoid errors in function prototypes */
-# define Display int
-# define Widget int
-# define GdkEvent int
-# define GdkEventKey int
-# define XImage int
-
-/* These prototypes cannot be produced automatically and conflict with
- * the old-style prototypes in message.c. */
-int
-smsg(char_u *, ...);
-
-int
-smsg_attr(int, char_u *, ...);
-
-int
-vim_snprintf_add(char *, size_t, char *, ...);
-
-int
-vim_snprintf(char *, size_t, char *, ...);
-
-int vim_vsnprintf(char *str, size_t str_m, char *fmt, va_list ap, typval_T *tvs);
-
-#endif /* !PROTO && !NOPROTO */
-
-#endif // NVIM_PROTO_H
diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index 4f321dc0b6..66adab1f2d 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -1105,7 +1105,6 @@ typedef int VimClipboard; /* This is required for the prototypes. */
#include "nvim/buffer_defs.h" /* buffer and windows */
#include "nvim/ex_cmds_defs.h" /* Ex command defines */
-#include "nvim/proto.h" /* function prototypes */
/* This has to go after the include of proto.h, as proto/gui.pro declares
* functions of these names. The declarations would break if the defines had