# HG changeset patch # User Bram Moolenaar # Date 1549050307 -3600 # Node ID 2b29779475c0cf057dacae67e715300ba85ba6d9 # Parent d911ba3e63e5a6350ecdf61bb8b5beac13c535cc patch 8.1.0866: build file dependencies are outdated commit https://github.com/vim/vim/commit/1c321dcee966b82a527cb34bbadd5874d6bc454a Author: Bram Moolenaar Date: Fri Feb 1 20:42:22 2019 +0100 patch 8.1.0866: build file dependencies are outdated Problem: Build file dependencies are outdated. (John Little) Solution: Run "make proto" and "make depend". diff --git a/src/Makefile b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -472,11 +472,8 @@ CClink = $(CC) # Uncomment this when you want to include the Cscope interface. #CONF_OPT_CSCOPE = --enable-cscope -# WORKSHOP - Sun Visual Workshop interface. Only works with Motif! -#CONF_OPT_WORKSHOP = --enable-workshop - # NETBEANS - NetBeans interface. Only works with Motif, GTK, and gnome. -# Motif version must have XPM libraries (see |workshop-xpm|). +# Motif version must have XPM libraries (see |netbeans-xpm|). # Uncomment this when you do not want the netbeans interface. #CONF_OPT_NETBEANS = --disable-netbeans @@ -610,6 +607,8 @@ CClink = $(CC) #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes # Use this with GCC to check for mistakes, unused arguments, etc. +# Note: If you use -Wextra and get warnings in GTK code about function +# parameters, you can add -Wno-cast-function-type #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 # Add -Wpedantic to find // comments and other C99 constructs. # Better disable Perl and Python to avoid a lot of warnings. @@ -3388,10 +3387,10 @@ objects/arabic.o: arabic.c vim.h protode auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h -objects/autocmd.o: autocmd.c vim.h protodef.h auto/config.h feature.h \ - auto/osdef.h os_unix.h os_mac.h ascii.h keymap.h term.h macros.h option.h beval.h \ - structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \ - farsi.h arabic.h +objects/autocmd.o: autocmd.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h objects/beval.o: beval.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ @@ -3497,9 +3496,9 @@ objects/if_xcmdsrv.o: if_xcmdsrv.c vim.h proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h farsi.h arabic.h version.h objects/indent.o: indent.c vim.h protodef.h auto/config.h feature.h os_unix.h \ - os_mac.h ascii.h keymap.h term.h macros.h option.h beval.h structs.h \ - regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h farsi.h \ - arabic.h + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h objects/json.o: json.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ diff --git a/src/proto/gui_w32.pro b/src/proto/gui_w32.pro --- a/src/proto/gui_w32.pro +++ b/src/proto/gui_w32.pro @@ -58,8 +58,8 @@ int gui_mch_maximized(void); void gui_mch_newfont(void); void gui_mch_settitle(char_u *title, char_u *icon); void mch_set_mouse_shape(int shape); +char_u *gui_mch_browse(int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter); char_u *gui_mch_browsedir(char_u *title, char_u *initdir); -char_u *gui_mch_browse(int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter); int get_cmd_args(char *prog, char *cmdline, char ***argvp, char **tofree); void gui_mch_set_parent(char *title); void gui_mch_prepare(int *argc, char **argv); diff --git a/src/proto/sign.pro b/src/proto/sign.pro --- a/src/proto/sign.pro +++ b/src/proto/sign.pro @@ -11,8 +11,8 @@ void sign_mark_adjust(linenr_T line1, li int sign_define_by_name(char_u *name, char_u *icon, char_u *linehl, char_u *text, char_u *texthl); int sign_undefine_by_name(char_u *name); int sign_place(int *sign_id, char_u *sign_group, char_u *sign_name, buf_T *buf, linenr_T lnum, int prio); +int sign_unplace(int sign_id, char_u *sign_group, buf_T *buf, linenr_T atlnum); linenr_T sign_jump(int sign_id, char_u *sign_group, buf_T *buf); -int sign_unplace(int sign_id, char_u *sign_group, buf_T *buf, linenr_T atlnum); void ex_sign(exarg_T *eap); void sign_getlist(char_u *name, list_T *retlist); void get_buffer_signs(buf_T *buf, list_T *l); @@ -24,3 +24,4 @@ void *sign_get_image(int typenr); void free_signs(void); char_u *get_sign_name(expand_T *xp, int idx); void set_context_in_sign_cmd(expand_T *xp, char_u *arg); +/* vim: set ft=c : */ diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -784,6 +784,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 866, +/**/ 865, /**/ 864, diff --git a/src/vim.h b/src/vim.h --- a/src/vim.h +++ b/src/vim.h @@ -260,15 +260,15 @@ # define SUN_SYSTEM #endif -/* if we're compiling in C++ (currently only KVim), the system +/* If we're compiling in C++ (currently only KVim), the system * headers must have the correct prototypes or nothing will build. - * conversely, our prototypes might clash due to throw() specifiers and + * Conversely, our prototypes might clash due to throw() specifiers and * cause compilation failures even though the headers are correct. For * a concrete example, gcc-3.2 enforces exception specifications, and * glibc-2.2.5 has them in their system headers. */ #if !defined(__cplusplus) && defined(UNIX) \ - && !defined(MACOS_X) /* MACOS_X doesn't yet support osdef.h */ + && !defined(MACOS_X) /* MACOS_X doesn't yet support osdef.h */ # include "auto/osdef.h" /* bring missing declarations in */ #endif @@ -2583,6 +2583,9 @@ long elapsed(struct timeval *start_tv); # define ELAPSED_TICKCOUNT # define ELAPSED_INIT(v) v = GetTickCount() # define ELAPSED_FUNC(v) elapsed(v) +# ifdef PROTO +typedef int DWORD; +# endif typedef DWORD elapsed_T; # ifndef PROTO long elapsed(DWORD start_tick);