diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-08-04 21:30:25 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-08-04 21:30:25 +0000 |
| commit | e8dc67ddefe96951e220a70714f880a41fedd2da (patch) | |
| tree | 1567eea825398bba91f93287d70721e70bc5bb40 /editors/vim | |
| parent | - Chase math/R upgrade (diff) | |
- Unbreak and fix build
PR: 125747 (based on)
Reported by: many
Submitted by: Martin Neubauer <m.ne@gmx.net>
No response from: maintainer (obrien, 14 days)
Notes
Notes:
svn path=/head/; revision=218040
Diffstat (limited to 'editors/vim')
| -rw-r--r-- | editors/vim/Makefile | 2 | ||||
| -rw-r--r-- | editors/vim/files/patch-src_vim.h | 31 |
2 files changed, 31 insertions, 2 deletions
diff --git a/editors/vim/Makefile b/editors/vim/Makefile index d4944c16cf0d..3e83bddf220f 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -31,8 +31,6 @@ PATCHFILES:= ${PATCHFILES:S/126/126ne/} MAINTAINER?= obrien@FreeBSD.org COMMENT?= Vi "workalike", with many additional features -BROKEN= does not build - SLAVEDIRS= editors/vim-lite .if defined(WITH_OPTIONS) || defined(WITH_VIM_OPTIONS) diff --git a/editors/vim/files/patch-src_vim.h b/editors/vim/files/patch-src_vim.h new file mode 100644 index 000000000000..0004a53d2fa8 --- /dev/null +++ b/editors/vim/files/patch-src_vim.h @@ -0,0 +1,31 @@ +--- vim.h.orig 2007-05-12 11:53:29.000000000 +0200 ++++ vim.h 2008-08-04 22:52:27.000000000 +0200 +@@ -355,16 +355,19 @@ + * On Win64 longs are 32 bit and pointers 64 bit. + * For printf() and scanf() we need to take care of long_u specifically. */ + #ifdef _WIN64 +-typedef unsigned __int64 long_u; +-typedef __int64 long_i; +-# define SCANF_HEX_LONG_U "%Ix" +-# define PRINTF_HEX_LONG_U "0x%Ix" +-#else +-typedef unsigned long long_u; +-typedef long long_i; +-# define SCANF_HEX_LONG_U "%lx" +-# define PRINTF_HEX_LONG_U "0x%lx" ++typedef unsigned __int64 long_u; ++typedef __int64 long_i; ++# define SCANF_HEX_LONG_U "%Ix" ++# define SCANF_DECIMAL_LONG_U "%Iu" ++# define PRINTF_HEX_LONG_U "0x%Ix" ++#else ++typedef unsigned long long_u; ++typedef long long_i; ++# define SCANF_HEX_LONG_U "%lx" ++# define SCANF_DECIMAL_LONG_U "%lu" ++# define PRINTF_HEX_LONG_U "0x%lx" + #endif ++#define PRINTF_DECIMAL_LONG_U SCANF_DECIMAL_LONG_U + + /* + * The characters and attributes cached for the screen. |