Skip to content

Commit f7506ca

Browse files
committed
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)
1 parent 92769c3 commit f7506ca

File tree

6 files changed

+12
-8
lines changed

6 files changed

+12
-8
lines changed

src/gui_at_sb.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,12 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
6060
/* created by weissman, Mon Jul 7 13:20:03 1986 */
6161
/* converted by swick, Thu Aug 27 1987 */
6262

63+
#include "vim.h"
64+
6365
#include <X11/IntrinsicP.h>
6466
#include <X11/StringDefs.h>
6567

6668
#include <X11/Xaw/XawInit.h>
67-
#include "vim.h"
6869
#include "gui_at_sb.h"
6970

7071
#include <X11/Xmu/Drawing.h>

src/gui_athena.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
* See README.txt for an overview of the Vim source code.
1010
*/
1111

12+
#include "vim.h"
13+
1214
#include <X11/StringDefs.h>
1315
#include <X11/Intrinsic.h>
1416
#ifdef FEAT_GUI_NEXTAW
@@ -34,7 +36,6 @@
3436
# include <X11/Xaw/AsciiText.h>
3537
#endif /* FEAT_GUI_NEXTAW */
3638

37-
#include "vim.h"
3839
#ifndef FEAT_GUI_NEXTAW
3940
# include "gui_at_sb.h"
4041
#endif

src/gui_motif.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
* See README.txt for an overview of the Vim source code.
99
*/
1010

11+
#include "vim.h"
12+
1113
#include <Xm/Form.h>
1214
#include <Xm/RowColumn.h>
1315
#include <Xm/PushB.h>
@@ -33,8 +35,6 @@
3335
#include <X11/StringDefs.h>
3436
#include <X11/Intrinsic.h>
3537

36-
#include "vim.h"
37-
3838
#ifdef HAVE_X11_XPM_H
3939
# include <X11/xpm.h>
4040
#else

src/gui_x11.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
* Not used for GTK.
1313
*/
1414

15+
#include "vim.h"
16+
1517
#include <X11/keysym.h>
1618
#include <X11/Xatom.h>
1719
#include <X11/StringDefs.h>
1820
#include <X11/Intrinsic.h>
1921
#include <X11/Shell.h>
2022
#include <X11/cursorfont.h>
2123

22-
#include "vim.h"
23-
2424
/*
2525
* For Workshop XpmP.h is preferred, because it makes the signs drawn with a
2626
* transparent background instead of black.

src/gui_xmdlg.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
* when using a dynamic scrollbar policy.
1717
*/
1818

19+
#include "vim.h"
20+
1921
#include <Xm/Form.h>
2022
#include <Xm/PushBG.h>
2123
#include <Xm/Text.h>
@@ -36,8 +38,6 @@
3638
#include <X11/StringDefs.h>
3739
#include <X11/Intrinsic.h>
3840

39-
#include "vim.h"
40-
4141
extern Widget vimShell;
4242

4343
#ifdef FEAT_MENU

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
367,
767769
/**/
768770
366,
769771
/**/

0 commit comments

Comments
 (0)