Patch 7.4.2285
Problem: Generated files are outdated.
Solution: Generate the files. Avoid errors when generating prototypes.
Files: src/if_mzsch.h, src/Makefile, src/option.h, src/os_mac_conv.c,
src/os_amiga.c, src/vim.h, src/structs.h, src/os_win32.c,
src/if_lua.c, src/proto/mbyte.pro
*** ../vim-7.4.2284/src/if_mzsch.h 2013-01-30 14:26:44.000000000 +0100
--- src/if_mzsch.h 2016-08-28 17:39:23.531225037 +0200
***************
*** 10,15 ****
--- 10,20 ----
# include <stdint.h>
#endif
+ #ifdef PROTO
+ /* avoid syntax error for defining Thread_Local_Variables. */
+ # define __thread /* empty */
+ #endif
+
/* #ifdef needed for "make depend" */
#ifdef FEAT_MZSCHEME
# include <schvers.h>
*** ../vim-7.4.2284/src/Makefile 2016-08-26 19:13:02.119896996 +0200
--- src/Makefile 2016-08-28 18:05:48.157719866 +0200
***************
*** 335,343 ****
# Uncomment one of these lines if you have that GUI but don't want to use it.
# The automatic check will use another one that can be found.
! # Gnome is disabled by default, it may cause trouble.
#CONF_OPT_GUI = --disable-gtk2-check
#CONF_OPT_GUI = --enable-gnome2-check
#CONF_OPT_GUI = --disable-motif-check
#CONF_OPT_GUI = --disable-athena-check
#CONF_OPT_GUI = --disable-nextaw-check
--- 335,347 ----
# Uncomment one of these lines if you have that GUI but don't want to use it.
# The automatic check will use another one that can be found.
! # Gnome is disabled by default, because it may cause trouble.
! #
! # When both GTK+ 2 and GTK+ 3 are possible then GTK+ 2 will be selected.
! # To use GTK+ 3 instead use --enable-gui=gtk3 (see below).
#CONF_OPT_GUI = --disable-gtk2-check
#CONF_OPT_GUI = --enable-gnome2-check
+ #CONF_OPT_GUI = --disable-gtk3-check
#CONF_OPT_GUI = --disable-motif-check
#CONF_OPT_GUI = --disable-athena-check
#CONF_OPT_GUI = --disable-nextaw-check
***************
*** 348,365 ****
#
# GTK versions that are known not to work 100% are rejected.
# Use "--disable-gtktest" to accept them anyway.
! # Only GTK 2 is supported, for GTK 1 use Vim 7.2.
#
# GNOME means GTK with Gnome support. If using GTK and --enable-gnome-check
# is used then GNOME will automatically be used if it is found. If you have
# GNOME, but do not want to use it (e.g., want a GTK-only version), then use
# --enable-gui=gtk or leave out --enable-gnome-check.
#
# If the selected GUI isn't found, the GUI is disabled automatically
#CONF_OPT_GUI = --enable-gui=gtk2
#CONF_OPT_GUI = --enable-gui=gtk2 --disable-gtktest
#CONF_OPT_GUI = --enable-gui=gnome2
#CONF_OPT_GUI = --enable-gui=gnome2 --disable-gtktest
#CONF_OPT_GUI = --enable-gui=motif
#CONF_OPT_GUI = --enable-gui=motif --with-motif-lib="-static -lXm -shared"
#CONF_OPT_GUI = --enable-gui=athena
--- 352,375 ----
#
# GTK versions that are known not to work 100% are rejected.
# Use "--disable-gtktest" to accept them anyway.
! # For GTK 1 use Vim 7.2.
#
# GNOME means GTK with Gnome support. If using GTK and --enable-gnome-check
# is used then GNOME will automatically be used if it is found. If you have
# GNOME, but do not want to use it (e.g., want a GTK-only version), then use
# --enable-gui=gtk or leave out --enable-gnome-check.
#
+ # GNOME makes sense only for GTK+ 2. Avoid use of --enable-gnome-check with
+ # GTK+ 3 build, as the functionality of GNOME is already incooperated into
+ # GTK+ 3.
+ #
# If the selected GUI isn't found, the GUI is disabled automatically
#CONF_OPT_GUI = --enable-gui=gtk2
#CONF_OPT_GUI = --enable-gui=gtk2 --disable-gtktest
#CONF_OPT_GUI = --enable-gui=gnome2
#CONF_OPT_GUI = --enable-gui=gnome2 --disable-gtktest
+ #CONF_OPT_GUI = --enable-gui=gtk3
+ #CONF_OPT_GUI = --enable-gui=gtk3 --disable-gtktest
#CONF_OPT_GUI = --enable-gui=motif
#CONF_OPT_GUI = --enable-gui=motif --with-motif-lib="-static -lXm -shared"
#CONF_OPT_GUI = --enable-gui=athena
***************
*** 368,374 ****
# Carbon GUI for Mac OS X
#CONF_OPT_GUI = --enable-gui=carbon
! # Uncomment this line to run an indivisual test with gvim.
#GUI_TESTARG = GUI_FLAG=-g
# DARWIN - detecting Mac OS X
--- 378,384 ----
# Carbon GUI for Mac OS X
#CONF_OPT_GUI = --enable-gui=carbon
! # Uncomment this line to run an individual test with gvim.
#GUI_TESTARG = GUI_FLAG=-g
# DARWIN - detecting Mac OS X
***************
*** 402,407 ****
--- 412,418 ----
# MZSCHEME
# Uncomment this when you want to include the MzScheme interface.
+ # NOTE: does not work well together with valgrind.
#CONF_OPT_MZSCHEME = --enable-mzschemeinterp
# PLT/mrscheme/drscheme Home dir; the PLTHOME environment variable also works
#CONF_OPT_PLTHOME = --with-plthome=/usr/local/plt
***************
*** 3371,3377 ****
objects/os_unix.o: os_unix.c vim.h auto/config.h feature.h os_unix.h
auto/osdef.h \
ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \
! globals.h farsi.h arabic.h os_unixx.h
objects/pathdef.o: auto/pathdef.c vim.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h spell.h \
--- 3382,3388 ----
objects/os_unix.o: os_unix.c vim.h auto/config.h feature.h os_unix.h
auto/osdef.h \
ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \
! globals.h farsi.h arabic.h if_mzsch.h os_unixx.h
objects/pathdef.o: auto/pathdef.c vim.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h spell.h \
***************
*** 3545,3551 ****
objects/if_mzsch.o: if_mzsch.c vim.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h spell.h \
! proto.h globals.h farsi.h arabic.h if_mzsch.h
objects/if_perl.o: auto/if_perl.c vim.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h spell.h \
--- 3556,3562 ----
objects/if_mzsch.o: if_mzsch.c vim.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h spell.h \
! proto.h globals.h farsi.h arabic.h if_mzsch.h mzscheme_base.c
objects/if_perl.o: auto/if_perl.c vim.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h spell.h \
*** ../vim-7.4.2284/src/option.h 2016-08-21 17:44:57.440487201 +0200
--- src/option.h 2016-08-21 20:14:02.285595603 +0200
***************
*** 343,349 ****
static char *(p_bo_values[]) = {"all", "backspace", "cursor", "complete",
"copy", "ctrlg", "error", "esc", "ex",
"hangul", "insertmode", "lang", "mess",
! "showmatch", "operator", "register", "shell",
"spell", "wildmode", NULL};
# endif
--- 343,349 ----
static char *(p_bo_values[]) = {"all", "backspace", "cursor", "complete",
"copy", "ctrlg", "error", "esc", "ex",
"hangul", "insertmode", "lang", "mess",
! "showmatch", "operator", "register", "shell",
"spell", "wildmode", NULL};
# endif
*** ../vim-7.4.2284/src/os_mac_conv.c 2016-01-30 20:31:21.241607996 +0100
--- src/os_mac_conv.c 2016-08-28 17:40:09.118833330 +0200
***************
*** 14,20 ****
*/
#define NO_X11_INCLUDES
! #define BalloonEval int /* used in header files */
#include "vim.h"
--- 14,20 ----
*/
#define NO_X11_INCLUDES
! typedef int BalloonEval; /* used in header files */
#include "vim.h"
*** ../vim-7.4.2284/src/os_amiga.c 2016-01-30 20:31:21.237608038 +0100
--- src/os_amiga.c 2016-08-28 17:43:04.797323897 +0200
***************
*** 1123,1129 ****
dos_packet(
struct MsgPort *pid, /* process identifier ... (handlers message port)
*/
long action, /* packet type ... (what you want handler to do)
*/
! arg) /* single argument */
{
# ifdef FEAT_ARP
struct MsgPort *replyport;
--- 1123,1129 ----
dos_packet(
struct MsgPort *pid, /* process identifier ... (handlers message port)
*/
long action, /* packet type ... (what you want handler to do)
*/
! long arg) /* single argument */
{
# ifdef FEAT_ARP
struct MsgPort *replyport;
*** ../vim-7.4.2284/src/vim.h 2016-08-26 17:58:33.586124416 +0200
--- src/vim.h 2016-08-28 17:54:01.935753910 +0200
***************
*** 410,416 ****
--- 410,420 ----
# define vim_ftell _ftelli64
# endif
#else
+ # ifdef PROTO
+ typedef long off_T;
+ # else
typedef off_t off_T;
+ # endif
# ifdef HAVE_FSEEKO
# define vim_lseek lseek
# define vim_ftell ftello
***************
*** 1809,1818 ****
* bits elsewhere. That causes memory corruption. Define time_T and use it
* for global variables to avoid that.
*/
! #ifdef WIN3264
! typedef __time64_t time_T;
#else
typedef time_t time_T;
#endif
#ifdef _WIN64
--- 1813,1826 ----
* bits elsewhere. That causes memory corruption. Define time_T and use it
* for global variables to avoid that.
*/
! #ifdef PROTO
! typedef long time_T;
#else
+ # ifdef WIN3264
+ typedef __time64_t time_T;
+ # else
typedef time_t time_T;
+ # endif
#endif
#ifdef _WIN64
*** ../vim-7.4.2284/src/structs.h 2016-08-26 22:29:06.083185153 +0200
--- src/structs.h 2016-08-28 17:47:04.047281004 +0200
***************
*** 1127,1134 ****
--- 1127,1139 ----
#ifdef FEAT_NUM64
/* Use 64-bit Number. */
# ifdef WIN3264
+ # ifdef PROTO
+ typedef long varnumber_T;
+ typedef unsigned long uvarnumber_T;
+ # else
typedef __int64 varnumber_T;
typedef unsigned __int64 uvarnumber_T;
+ # endif
# elif defined(HAVE_STDINT_H)
typedef int64_t varnumber_T;
typedef uint64_t uvarnumber_T;
*** ../vim-7.4.2284/src/os_win32.c 2016-08-25 23:19:25.671805229 +0200
--- src/os_win32.c 2016-08-28 17:48:35.430510205 +0200
***************
*** 137,142 ****
--- 137,144 ----
typedef int PSNSECINFOW;
typedef int STARTUPINFO;
typedef int PROCESS_INFORMATION;
+ typedef int LPSECURITY_ATTRIBUTES;
+ # define __stdcall /* empty */
#endif
#ifndef FEAT_GUI_W32
*** ../vim-7.4.2284/src/proto/mbyte.pro 2016-04-02 22:14:47.074253291 +0200
--- src/proto/mbyte.pro 2016-08-28 17:54:26.295548132 +0200
***************
*** 10,16 ****
int latin_char2bytes(int c, char_u *buf);
int latin_ptr2len(char_u *p);
int latin_ptr2len_len(char_u *p, int size);
- int utf_ambiguous_width(int c);
int utf_char2cells(int c);
int latin_ptr2cells(char_u *p);
int utf_ptr2cells(char_u *p);
--- 10,15 ----
***************
*** 41,46 ****
--- 40,46 ----
int utf_iscomposing(int c);
int utf_printable(int c);
int utf_class(int c);
+ int utf_ambiguous_width(int c);
int utf_fold(int a);
int utf_toupper(int a);
int utf_islower(int a);
*** ../vim-7.4.2284/src/if_lua.c 2016-07-24 21:58:39.704057634 +0200
--- src/if_lua.c 2016-08-28 18:08:52.756116050 +0200
***************
*** 398,411 ****
}
return OK;
}
int
lua_enabled(int verbose)
{
return lua_link_init((char *)p_luadll, verbose) == OK;
}
!
! #endif /* DYNAMIC_LUA */
#if LUA_VERSION_NUM > 501
static int
--- 398,412 ----
}
return OK;
}
+ #endif /* DYNAMIC_LUA */
+ #if defined(DYNAMIC_LUA) || defined(PROTO)
int
lua_enabled(int verbose)
{
return lua_link_init((char *)p_luadll, verbose) == OK;
}
! #endif
#if LUA_VERSION_NUM > 501
static int
*** ../vim-7.4.2284/src/version.c 2016-08-28 17:15:21.887689299 +0200
--- src/version.c 2016-08-28 17:31:30.239292180 +0200
***************
*** 765,766 ****
--- 765,768 ----
{ /* Add new patch number below this line */
+ /**/
+ 2285,
/**/
--
>From "know your smileys":
:-| :-| Deja' vu!
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
