patch 7.4.2192

Problem:    Generating prototypes with Cygwin doesn't work well.
Solution:   Change #ifdefs. (Ken Takata)

diff --git a/src/gui.h b/src/gui.h
index 81c6b9ab5c11d43e986f612610799724781a18ca..508b7cf7bf7fadc4c093dfd340d21a40dbf0cbe3 100644 (file)
--- a/src/gui.h
+++ b/src/gui.h
@@ -16,7 +16,7 @@
 # include <X11/StringDefs.h>
 #endif
 
-#ifdef FEAT_BEVAL
+#if defined(FEAT_BEVAL) || defined(PROTO)
 # include "gui_beval.h"
 #endif
 

diff --git a/src/gui_w32.c b/src/gui_w32.c
index 19f4d65002e7a0b00b2f552a7a630fa5621abc9a..78db43e6b3ead5805ec1776ff79542d05af9a19a 100644 (file)
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -247,6 +247,7 @@ gui_mch_set_rendering_options(char_u *s)
 # define CONST
 # define FAR
 # define NEAR
+# undef _cdecl
 # define _cdecl
 typedef int BOOL;
 typedef int BYTE;
@@ -288,6 +289,7 @@ typedef void VOID;
 typedef int LPNMHDR;
 typedef int LONG;
 typedef int WNDPROC;
+typedef int UINT_PTR;
 #endif
 
 #ifndef GET_X_LPARAM
@@ -3451,7 +3453,7 @@ gui_mch_settitle(
     set_window_title(s_hwnd, (title == NULL ? "VIM" : (char *)title));
 }
 
-#ifdef FEAT_MOUSESHAPE
+#if defined(FEAT_MOUSESHAPE) || defined(PROTO)
 /* Table for shape IDCs.  Keep in sync with the mshape_names[] table in
  * misc2.c! */
 static LPCSTR mshape_idcs[] =
@@ -3514,7 +3516,7 @@ mch_set_mouse_shape(int shape)
 }
 #endif
 
-#ifdef FEAT_BROWSE
+#if defined(FEAT_BROWSE) || defined(PROTO)
 /*
  * The file browser exists in two versions: with "W" uses wide characters,
  * without "W" the current codepage.  When FEAT_MBYTE is defined and on

diff --git a/src/ops.c b/src/ops.c
index 1767eb521e308708200f78888f20465bee07bc1c..325a95b7f7c51db46ab343203ecf13953b297cb9 100644 (file)
--- a/src/ops.c
+++ b/src/ops.c
@@ -6283,7 +6283,7 @@ write_viminfo_registers(FILE *fp)
  * 'permanent' of the two), otherwise the PRIMARY one.
  * For now, use a hard-coded sanity limit of 1Mb of data.
  */
-#if defined(FEAT_X11) && defined(FEAT_CLIPBOARD)
+#if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) || defined(PROTO)
     void
 x11_export_final_selection(void)
 {

diff --git a/src/proto/fileio.pro b/src/proto/fileio.pro
index 5f1bc75d118dd146c390158169f445af0b21c395..748bf4c9b11beb4d8f3134ef1345378607c919ee 100644 (file)
--- a/src/proto/fileio.pro
+++ b/src/proto/fileio.pro
@@ -33,7 +33,7 @@ void free_all_autocmds(void);
 int check_ei(void);
 char_u *au_event_disable(char *what);
 void au_event_restore(char_u *old_ei);
-void do_autocmd(char_u *arg, int forceit);
+void do_autocmd(char_u *arg_in, int forceit);
 int do_doautocmd(char_u *arg, int do_msg, int *did_something);
 void ex_doautoall(exarg_T *eap);
 int check_nomodeline(char_u **argp);

diff --git a/src/proto/message.pro b/src/proto/message.pro
index 5b7064009679262cc3a6d960d2f5c59faf0bdfd6..ba8ff37c39b117b5b3b3eef0f7fa8ba18727f86c 100644 (file)
--- a/src/proto/message.pro
+++ b/src/proto/message.pro
@@ -4,7 +4,7 @@ int verb_msg(char_u *s);
 int msg_attr(char_u *s, int attr);
 int msg_attr_keep(char_u *s, int attr, int keep);
 char_u *msg_strtrunc(char_u *s, int force);
-void trunc_string(char_u *s, char_u *buf, int room, int buflen);
+void trunc_string(char_u *s, char_u *buf, int room_in, int buflen);
 void reset_last_sourcing(void);
 void msg_source(int attr);
 int emsg_not_now(void);

diff --git a/src/proto/normal.pro b/src/proto/normal.pro
index 52c7ca5ce874260eb55abd78ba55fcd4956653dd..55d12bb2927cbf68966d70667e53143028c915c7 100644 (file)
--- a/src/proto/normal.pro
+++ b/src/proto/normal.pro
@@ -16,7 +16,7 @@ void push_showcmd(void);
 void pop_showcmd(void);
 void do_check_scrollbind(int check);
 void check_scrollbind(linenr_T topline_diff, long leftcol_diff);
-int find_decl(char_u *ptr, int len, int locally, int thisblock, int searchflags);
+int find_decl(char_u *ptr, int len, int locally, int thisblock, int flags_arg);
 void scroll_redraw(int up, long count);
 void handle_tabmenu(void);
 void do_nv_ident(int c1, int c2);

diff --git a/src/proto/ops.pro b/src/proto/ops.pro
index 5a603d004fcff4a7a8fbc6b927e4a1de7717b5af..de4ae739990f3ea0a108151eb987dd01861226aa 100644 (file)
--- a/src/proto/ops.pro
+++ b/src/proto/ops.pro
@@ -47,7 +47,7 @@ void op_addsub(oparg_T *oap, linenr_T Prenum1, int g_cmd);
 void prepare_viminfo_registers(void);
 void finish_viminfo_registers(void);
 int read_viminfo_register(vir_T *virp, int force);
-void handle_viminfo_register(garray_T *values, int writing);
+void handle_viminfo_register(garray_T *values, int force);
 void write_viminfo_registers(FILE *fp);
 void x11_export_final_selection(void);
 void clip_free_selection(VimClipboard *cbd);

diff --git a/src/version.c b/src/version.c
index 8735b64ba91c62267ce6ba1e54561967f4e2fd08..c775c3736a8ada0180603300afb49fd556e089ce 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2192,
 /**/
     2191,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 085f73d8a221c3817e3c0fe5e9a25c6242f826a6..05f97ba69eeff555ad23ef3a0521afc77647711e 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -2109,7 +2109,7 @@ typedef enum
  * been seen at that stage.  But it must be before globals.h, where error_ga
  * is declared. */
 #if !defined(FEAT_GUI_W32) && !defined(FEAT_GUI_X11) \
-       && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MAC)
+       && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MAC) && !defined(PROTO)
 # define mch_errmsg(str)       fprintf(stderr, "%s", (str))
 # define display_errors()      fflush(stderr)
 # define mch_msg(str)          printf("%s", (str))