# HG changeset patch # User Christian Brabandt # Date 1488035704 -3600 # Node ID 90af0c60d78dee45ce1afb4d0c56f5c08b8d004e # Parent a555c11b59a93a1833dab069616787dab0fadcf0 patch 8.0.0367: types in include files may be inconsistent commit https://github.com/vim/vim/commit/f7506cade470efd122fa8fb61dd4e5ad21d1e246 Author: Bram Moolenaar 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) diff --git a/src/gui_at_sb.c b/src/gui_at_sb.c --- 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 #include #include -#include "vim.h" #include "gui_at_sb.h" #include diff --git a/src/gui_athena.c b/src/gui_athena.c --- 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 #include #ifdef FEAT_GUI_NEXTAW @@ -34,7 +36,6 @@ # include #endif /* FEAT_GUI_NEXTAW */ -#include "vim.h" #ifndef FEAT_GUI_NEXTAW # include "gui_at_sb.h" #endif diff --git a/src/gui_motif.c b/src/gui_motif.c --- 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 #include #include @@ -33,8 +35,6 @@ #include #include -#include "vim.h" - #ifdef HAVE_X11_XPM_H # include #else diff --git a/src/gui_x11.c b/src/gui_x11.c --- a/src/gui_x11.c +++ b/src/gui_x11.c @@ -12,6 +12,8 @@ * Not used for GTK. */ +#include "vim.h" + #include #include #include @@ -19,8 +21,6 @@ #include #include -#include "vim.h" - /* * For Workshop XpmP.h is preferred, because it makes the signs drawn with a * transparent background instead of black. diff --git a/src/gui_xmdlg.c b/src/gui_xmdlg.c --- a/src/gui_xmdlg.c +++ b/src/gui_xmdlg.c @@ -16,6 +16,8 @@ * when using a dynamic scrollbar policy. */ +#include "vim.h" + #include #include #include @@ -36,8 +38,6 @@ #include #include -#include "vim.h" - extern Widget vimShell; #ifdef FEAT_MENU diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 367, +/**/ 366, /**/ 365,