mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
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)
This commit is contained in:
@@ -60,11 +60,12 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||||||
/* created by weissman, Mon Jul 7 13:20:03 1986 */
|
/* created by weissman, Mon Jul 7 13:20:03 1986 */
|
||||||
/* converted by swick, Thu Aug 27 1987 */
|
/* converted by swick, Thu Aug 27 1987 */
|
||||||
|
|
||||||
|
#include "vim.h"
|
||||||
|
|
||||||
#include <X11/IntrinsicP.h>
|
#include <X11/IntrinsicP.h>
|
||||||
#include <X11/StringDefs.h>
|
#include <X11/StringDefs.h>
|
||||||
|
|
||||||
#include <X11/Xaw/XawInit.h>
|
#include <X11/Xaw/XawInit.h>
|
||||||
#include "vim.h"
|
|
||||||
#include "gui_at_sb.h"
|
#include "gui_at_sb.h"
|
||||||
|
|
||||||
#include <X11/Xmu/Drawing.h>
|
#include <X11/Xmu/Drawing.h>
|
||||||
|
@@ -9,6 +9,8 @@
|
|||||||
* See README.txt for an overview of the Vim source code.
|
* See README.txt for an overview of the Vim source code.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "vim.h"
|
||||||
|
|
||||||
#include <X11/StringDefs.h>
|
#include <X11/StringDefs.h>
|
||||||
#include <X11/Intrinsic.h>
|
#include <X11/Intrinsic.h>
|
||||||
#ifdef FEAT_GUI_NEXTAW
|
#ifdef FEAT_GUI_NEXTAW
|
||||||
@@ -34,7 +36,6 @@
|
|||||||
# include <X11/Xaw/AsciiText.h>
|
# include <X11/Xaw/AsciiText.h>
|
||||||
#endif /* FEAT_GUI_NEXTAW */
|
#endif /* FEAT_GUI_NEXTAW */
|
||||||
|
|
||||||
#include "vim.h"
|
|
||||||
#ifndef FEAT_GUI_NEXTAW
|
#ifndef FEAT_GUI_NEXTAW
|
||||||
# include "gui_at_sb.h"
|
# include "gui_at_sb.h"
|
||||||
#endif
|
#endif
|
||||||
|
@@ -8,6 +8,8 @@
|
|||||||
* See README.txt for an overview of the Vim source code.
|
* See README.txt for an overview of the Vim source code.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "vim.h"
|
||||||
|
|
||||||
#include <Xm/Form.h>
|
#include <Xm/Form.h>
|
||||||
#include <Xm/RowColumn.h>
|
#include <Xm/RowColumn.h>
|
||||||
#include <Xm/PushB.h>
|
#include <Xm/PushB.h>
|
||||||
@@ -33,8 +35,6 @@
|
|||||||
#include <X11/StringDefs.h>
|
#include <X11/StringDefs.h>
|
||||||
#include <X11/Intrinsic.h>
|
#include <X11/Intrinsic.h>
|
||||||
|
|
||||||
#include "vim.h"
|
|
||||||
|
|
||||||
#ifdef HAVE_X11_XPM_H
|
#ifdef HAVE_X11_XPM_H
|
||||||
# include <X11/xpm.h>
|
# include <X11/xpm.h>
|
||||||
#else
|
#else
|
||||||
|
@@ -12,6 +12,8 @@
|
|||||||
* Not used for GTK.
|
* Not used for GTK.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "vim.h"
|
||||||
|
|
||||||
#include <X11/keysym.h>
|
#include <X11/keysym.h>
|
||||||
#include <X11/Xatom.h>
|
#include <X11/Xatom.h>
|
||||||
#include <X11/StringDefs.h>
|
#include <X11/StringDefs.h>
|
||||||
@@ -19,8 +21,6 @@
|
|||||||
#include <X11/Shell.h>
|
#include <X11/Shell.h>
|
||||||
#include <X11/cursorfont.h>
|
#include <X11/cursorfont.h>
|
||||||
|
|
||||||
#include "vim.h"
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* For Workshop XpmP.h is preferred, because it makes the signs drawn with a
|
* For Workshop XpmP.h is preferred, because it makes the signs drawn with a
|
||||||
* transparent background instead of black.
|
* transparent background instead of black.
|
||||||
|
@@ -16,6 +16,8 @@
|
|||||||
* when using a dynamic scrollbar policy.
|
* when using a dynamic scrollbar policy.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "vim.h"
|
||||||
|
|
||||||
#include <Xm/Form.h>
|
#include <Xm/Form.h>
|
||||||
#include <Xm/PushBG.h>
|
#include <Xm/PushBG.h>
|
||||||
#include <Xm/Text.h>
|
#include <Xm/Text.h>
|
||||||
@@ -36,8 +38,6 @@
|
|||||||
#include <X11/StringDefs.h>
|
#include <X11/StringDefs.h>
|
||||||
#include <X11/Intrinsic.h>
|
#include <X11/Intrinsic.h>
|
||||||
|
|
||||||
#include "vim.h"
|
|
||||||
|
|
||||||
extern Widget vimShell;
|
extern Widget vimShell;
|
||||||
|
|
||||||
#ifdef FEAT_MENU
|
#ifdef FEAT_MENU
|
||||||
|
@@ -764,6 +764,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
367,
|
||||||
/**/
|
/**/
|
||||||
366,
|
366,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user