To: vim_dev@googlegroups.com
Subject: Patch 8.0.0367
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.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)
Files:      src/gui_at_sb.c, src/gui_athena.c, src/gui_motif.c, src/gui_x11.c,
            src/gui_xmdlg.c


*** ../vim-8.0.0366/src/gui_at_sb.c	2016-08-29 22:42:20.000000000 +0200
--- src/gui_at_sb.c	2017-02-25 15:53:35.521594542 +0100
***************
*** 60,70 ****
  /* created by weissman, Mon Jul  7 13:20:03 1986 */
  /* converted by swick, Thu Aug 27 1987 */
  
  #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>
--- 60,71 ----
  /* 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 "gui_at_sb.h"
  
  #include <X11/Xmu/Drawing.h>
*** ../vim-8.0.0366/src/gui_athena.c	2016-08-29 22:42:20.000000000 +0200
--- src/gui_athena.c	2017-02-25 15:53:35.521594542 +0100
***************
*** 9,14 ****
--- 9,16 ----
   * 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,40 ****
  # include <X11/Xaw/AsciiText.h>
  #endif /* FEAT_GUI_NEXTAW */
  
- #include "vim.h"
  #ifndef FEAT_GUI_NEXTAW
  # include "gui_at_sb.h"
  #endif
--- 36,41 ----
*** ../vim-8.0.0366/src/gui_motif.c	2016-08-29 22:42:20.000000000 +0200
--- src/gui_motif.c	2017-02-25 15:53:35.521594542 +0100
***************
*** 8,13 ****
--- 8,15 ----
   * 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,40 ****
  #include <X11/StringDefs.h>
  #include <X11/Intrinsic.h>
  
- #include "vim.h"
- 
  #ifdef HAVE_X11_XPM_H
  # include <X11/xpm.h>
  #else
--- 35,40 ----
*** ../vim-8.0.0366/src/gui_x11.c	2016-08-29 22:42:20.000000000 +0200
--- src/gui_x11.c	2017-02-25 15:53:35.521594542 +0100
***************
*** 12,17 ****
--- 12,19 ----
   * Not used for GTK.
   */
  
+ #include "vim.h"
+ 
  #include <X11/keysym.h>
  #include <X11/Xatom.h>
  #include <X11/StringDefs.h>
***************
*** 19,26 ****
  #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.
--- 21,26 ----
*** ../vim-8.0.0366/src/gui_xmdlg.c	2016-08-29 22:42:20.000000000 +0200
--- src/gui_xmdlg.c	2017-02-25 15:53:35.521594542 +0100
***************
*** 16,21 ****
--- 16,23 ----
   * when using a dynamic scrollbar policy.
   */
  
+ #include "vim.h"
+ 
  #include <Xm/Form.h>
  #include <Xm/PushBG.h>
  #include <Xm/Text.h>
***************
*** 36,43 ****
  #include <X11/StringDefs.h>
  #include <X11/Intrinsic.h>
  
- #include "vim.h"
- 
  extern Widget vimShell;
  
  #ifdef FEAT_MENU
--- 38,43 ----
*** ../vim-8.0.0366/src/version.c	2017-02-25 15:41:33.142201356 +0100
--- src/version.c	2017-02-25 16:00:23.462981271 +0100
***************
*** 766,767 ****
--- 766,769 ----
  {   /* Add new patch number below this line */
+ /**/
+     367,
  /**/

-- 
Computers are useless. They can only give you answers.
                -- Pablo Picasso

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///