Skip to content

Commit

Permalink
patch 8.1.0866: build file dependencies are outdated
Browse files Browse the repository at this point in the history
Problem:    Build file dependencies are outdated. (John Little)
Solution:   Run "make proto" and "make depend".
  • Loading branch information
brammool committed Feb 1, 2019
1 parent 895d966 commit 1c321dc
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 16 deletions.
21 changes: 10 additions & 11 deletions src/Makefile
Expand Up @@ -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

Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -3388,10 +3387,10 @@ objects/arabic.o: arabic.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/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 \
Expand Down Expand Up @@ -3497,9 +3496,9 @@ objects/if_xcmdsrv.o: if_xcmdsrv.c vim.h protodef.h auto/config.h feature.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 \
Expand Down
2 changes: 1 addition & 1 deletion src/proto/gui_w32.pro
Expand Up @@ -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_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);
char_u *gui_mch_browsedir(char_u *title, char_u *initdir);
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);
Expand Down
3 changes: 2 additions & 1 deletion src/proto/sign.pro
Expand Up @@ -11,8 +11,8 @@ void sign_mark_adjust(linenr_T line1, linenr_T line2, long amount, long amount_a
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);
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);
linenr_T sign_jump(int sign_id, char_u *sign_group, buf_T *buf);
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);
Expand All @@ -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 : */
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -783,6 +783,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
866,
/**/
865,
/**/
Expand Down
9 changes: 6 additions & 3 deletions src/vim.h
Expand Up @@ -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

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 1c321dc

Please sign in to comment.