Mercurial > vim
changeset 10956:90af0c60d78d v8.0.0367
patch 8.0.0367: types in include files may be inconsistent
commit https://github.com/vim/vim/commit/f7506cade470efd122fa8fb61dd4e5ad21d1e246
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Feb 25 16:01:49 2017 +0100
patch 8.0.0367: types in include files may be inconsistent
Problem: If configure defines _LARGE_FILES some include files are included
before it is defined.
Solution: Include vim.h first. (Sam Thursfield, closes #1508)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 25 Feb 2017 16:15:04 +0100 |
parents | a555c11b59a9 |
children | 08a5e8f52a7a |
files | src/gui_at_sb.c src/gui_athena.c src/gui_motif.c src/gui_x11.c src/gui_xmdlg.c src/version.c |
diffstat | 6 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui_at_sb.c +++ b/src/gui_at_sb.c @@ -60,11 +60,12 @@ CONNECTION WITH THE USE OR PERFORMANCE O /* created by weissman, Mon Jul 7 13:20:03 1986 */ /* converted by swick, Thu Aug 27 1987 */ +#include "vim.h" + #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> #include <X11/Xaw/XawInit.h> -#include "vim.h" #include "gui_at_sb.h" #include <X11/Xmu/Drawing.h>
--- a/src/gui_athena.c +++ b/src/gui_athena.c @@ -9,6 +9,8 @@ * See README.txt for an overview of the Vim source code. */ +#include "vim.h" + #include <X11/StringDefs.h> #include <X11/Intrinsic.h> #ifdef FEAT_GUI_NEXTAW @@ -34,7 +36,6 @@ # include <X11/Xaw/AsciiText.h> #endif /* FEAT_GUI_NEXTAW */ -#include "vim.h" #ifndef FEAT_GUI_NEXTAW # include "gui_at_sb.h" #endif
--- a/src/gui_motif.c +++ b/src/gui_motif.c @@ -8,6 +8,8 @@ * See README.txt for an overview of the Vim source code. */ +#include "vim.h" + #include <Xm/Form.h> #include <Xm/RowColumn.h> #include <Xm/PushB.h> @@ -33,8 +35,6 @@ #include <X11/StringDefs.h> #include <X11/Intrinsic.h> -#include "vim.h" - #ifdef HAVE_X11_XPM_H # include <X11/xpm.h> #else
--- a/src/gui_x11.c +++ b/src/gui_x11.c @@ -12,6 +12,8 @@ * Not used for GTK. */ +#include "vim.h" + #include <X11/keysym.h> #include <X11/Xatom.h> #include <X11/StringDefs.h> @@ -19,8 +21,6 @@ #include <X11/Shell.h> #include <X11/cursorfont.h> -#include "vim.h" - /* * For Workshop XpmP.h is preferred, because it makes the signs drawn with a * transparent background instead of black.
--- a/src/gui_xmdlg.c +++ b/src/gui_xmdlg.c @@ -16,6 +16,8 @@ * when using a dynamic scrollbar policy. */ +#include "vim.h" + #include <Xm/Form.h> #include <Xm/PushBG.h> #include <Xm/Text.h> @@ -36,8 +38,6 @@ #include <X11/StringDefs.h> #include <X11/Intrinsic.h> -#include "vim.h" - extern Widget vimShell; #ifdef FEAT_MENU