|
 |
1749f06 |
To: vim-dev@vim.org
|
|
|
1749f06 |
Subject: Patch 7.3.021
|
|
|
1749f06 |
Fcc: outbox
|
|
|
1749f06 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
1749f06 |
Mime-Version: 1.0
|
|
|
1749f06 |
Content-Type: text/plain; charset=UTF-8
|
|
|
1749f06 |
Content-Transfer-Encoding: 8bit
|
|
|
1749f06 |
------------
|
|
|
1749f06 |
|
|
|
1749f06 |
Patch 7.3.021
|
|
|
1749f06 |
Problem: Conflict for defining Boolean in Mac header files.
|
|
|
1749f06 |
Solution: Define NO_X11_INCLUDES. (Rainer Muller)
|
|
|
1749f06 |
Files: src/os_macosx.m, src/vim.h
|
|
|
1749f06 |
|
|
|
1749f06 |
|
|
|
1749f06 |
*** ../vim-7.3.020/src/os_macosx.m 2010-08-15 21:57:29.000000000 +0200
|
|
|
1749f06 |
--- src/os_macosx.m 2010-10-10 17:01:55.000000000 +0200
|
|
|
1749f06 |
***************
|
|
|
1749f06 |
*** 15,20 ****
|
|
|
1749f06 |
--- 15,24 ----
|
|
|
1749f06 |
Error: MACOS 9 is no longer supported in Vim 7
|
|
|
1749f06 |
#endif
|
|
|
1749f06 |
|
|
|
1749f06 |
+ /* Avoid a conflict for the definition of Boolean between Mac header files and
|
|
|
1749f06 |
+ * X11 header files. */
|
|
|
1749f06 |
+ #define NO_X11_INCLUDES
|
|
|
1749f06 |
+
|
|
|
1749f06 |
#include "vim.h"
|
|
|
1749f06 |
#import <Cocoa/Cocoa.h>
|
|
|
1749f06 |
|
|
|
1749f06 |
*** ../vim-7.3.020/src/vim.h 2010-08-15 21:57:29.000000000 +0200
|
|
|
1749f06 |
--- src/vim.h 2010-10-10 17:02:56.000000000 +0200
|
|
|
1749f06 |
***************
|
|
|
1749f06 |
*** 192,199 ****
|
|
|
1749f06 |
#endif
|
|
|
1749f06 |
|
|
|
1749f06 |
#ifdef NO_X11_INCLUDES
|
|
|
1749f06 |
! /* In os_mac_conv.c NO_X11_INCLUDES is defined to avoid X11 headers.
|
|
|
1749f06 |
! * Disable all X11 related things to avoid conflicts. */
|
|
|
1749f06 |
# ifdef FEAT_X11
|
|
|
1749f06 |
# undef FEAT_X11
|
|
|
1749f06 |
# endif
|
|
|
1749f06 |
--- 192,199 ----
|
|
|
1749f06 |
#endif
|
|
|
1749f06 |
|
|
|
1749f06 |
#ifdef NO_X11_INCLUDES
|
|
|
1749f06 |
! /* In os_mac_conv.c and os_macosx.m NO_X11_INCLUDES is defined to avoid
|
|
|
1749f06 |
! * X11 headers. Disable all X11 related things to avoid conflicts. */
|
|
|
1749f06 |
# ifdef FEAT_X11
|
|
|
1749f06 |
# undef FEAT_X11
|
|
|
1749f06 |
# endif
|
|
|
1749f06 |
*** ../vim-7.3.020/src/version.c 2010-10-09 17:21:42.000000000 +0200
|
|
|
1749f06 |
--- src/version.c 2010-10-10 17:05:19.000000000 +0200
|
|
|
1749f06 |
***************
|
|
|
1749f06 |
*** 716,717 ****
|
|
|
1749f06 |
--- 716,719 ----
|
|
|
1749f06 |
{ /* Add new patch number below this line */
|
|
|
1749f06 |
+ /**/
|
|
|
1749f06 |
+ 21,
|
|
|
1749f06 |
/**/
|
|
|
1749f06 |
|
|
|
1749f06 |
--
|
|
|
1749f06 |
hundred-and-one symptoms of being an internet addict:
|
|
|
1749f06 |
259. When you enter your name in the AltaVista search engine, the top ten
|
|
|
1749f06 |
matches do indeed refer to you.
|
|
|
1749f06 |
|
|
|
1749f06 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
1749f06 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
1749f06 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
1749f06 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|