vim/patches/vim-7.3.021.patch0

   1 To: vim-dev@vim.org
   2 Subject: Patch 7.3.021
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.021
  11 Problem:    Conflict for defining Boolean in Mac header files.
  12 Solution:   Define NO_X11_INCLUDES. (Rainer Muller)
  13 Files:      src/os_macosx.m, src/vim.h
  14
  15
  16 *** ../vim-7.3.020/src/os_macosx.m      2010-08-15 21:57:29.000000000 +0200
  17 --- src/os_macosx.m     2010-10-10 17:01:55.000000000 +0200
  18 ***************
  19 *** 15,20 ****
  20 --- 15,24 ----
  21       Error: MACOS 9 is no longer supported in Vim 7
  22   #endif
  23
  24 + /* Avoid a conflict for the definition of Boolean between Mac header files and
  25 +  * X11 header files. */
  26 + #define NO_X11_INCLUDES
  27 +
  28   #include "vim.h"
  29   #import <Cocoa/Cocoa.h>
  30
  31 *** ../vim-7.3.020/src/vim.h    2010-08-15 21:57:29.000000000 +0200
  32 --- src/vim.h   2010-10-10 17:02:56.000000000 +0200
  33 ***************
  34 *** 192,199 ****
  35   #endif
  36
  37   #ifdef NO_X11_INCLUDES
  38 !     /* In os_mac_conv.c NO_X11_INCLUDES is defined to avoid X11 headers.
  39 !      * Disable all X11 related things to avoid conflicts. */
  40   # ifdef FEAT_X11
  41   #  undef FEAT_X11
  42   # endif
  43 --- 192,199 ----
  44   #endif
  45
  46   #ifdef NO_X11_INCLUDES
  47 !     /* In os_mac_conv.c and os_macosx.m NO_X11_INCLUDES is defined to avoid
  48 !      * X11 headers.  Disable all X11 related things to avoid conflicts. */
  49   # ifdef FEAT_X11
  50   #  undef FEAT_X11
  51   # endif
  52 *** ../vim-7.3.020/src/version.c        2010-10-09 17:21:42.000000000 +0200
  53 --- src/version.c       2010-10-10 17:05:19.000000000 +0200
  54 ***************
  55 *** 716,717 ****
  56 --- 716,719 ----
  57   {   /* Add new patch number below this line */
  58 + /**/
  59 +     21,
  60   /**/
  61
  62 --
  63 hundred-and-one symptoms of being an internet addict:
  64 259. When you enter your name in the AltaVista search engine, the top ten
  65      matches do indeed refer to you.
  66
  67  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  68 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  69 \\\        download, build and distribute -- http://www.A-A-P.org        ///
  70  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///