patch 8.0.0367: types in include files may be inconsistentv8.0.0367

Problem:    If configure defines _LARGE_FILES some include files are included
            before it is defined.
Solution:   Include vim.h first. (Sam Thursfield, closes #1508)

6 files changed, 12 insertions, 8 deletions

diff --git a/src/gui_at_sb.c b/src/gui_at_sb.c
index bfdf6b6f5..659e93463 100644
--- a/src/gui_at_sb.c
+++ b/src/gui_at_sb.c
@@ -60,11 +60,12 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* 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>
diff --git a/src/gui_athena.c b/src/gui_athena.c
index 3d782877c..18e3a8b0c 100644
--- 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
diff --git a/src/gui_motif.c b/src/gui_motif.c
index 5a9dd9248..4e4dffad9 100644
--- 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
diff --git a/src/gui_x11.c b/src/gui_x11.c
index 05bd02817..2cc0eba85 100644
--- 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.
diff --git a/src/gui_xmdlg.c b/src/gui_xmdlg.c
index f957e31f1..01e536c1e 100644
--- 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
diff --git a/src/version.c b/src/version.c
index 7e6438c57..6d15166a7 100644
--- 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,