To: vim-dev@vim.org Subject: Patch 6.2f.018 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.2f.018 Problem: Mac OS X 10.2: OK is defined to zero in cursus.h while Vim uses one. Redefining it causes a warning message. Solution: Undefine OK before defining it to one. (Taro Muraoka) Files: src/vim.h *** ../vim-6.2f.017/src/vim.h Mon May 26 22:15:06 2003 --- src/vim.h Thu May 29 11:32:47 2003 *************** *** 528,535 **** /* return values for functions */ #if !(defined(OK) && (OK == 1)) ! /* OK already defined to 1 in MacOS X curses */ ! /* (still protect against any other OK) */ # define OK 1 #endif #define FAIL 0 --- 528,538 ---- /* return values for functions */ #if !(defined(OK) && (OK == 1)) ! /* OK already defined to 1 in MacOS X curses, skip this */ ! /* OK defined to 0 in MacOS X 10.2 curses! redefine it */ ! # if defined(OK) && defined(MACOS_X_UNIX) ! # undef OK ! # endif # define OK 1 #endif #define FAIL 0 *** ../vim-6.2f.017/src/version.c Thu May 29 13:37:09 2003 --- src/version.c Thu May 29 13:42:55 2003 *************** *** 632,633 **** --- 632,635 ---- { /* Add new patch number below this line */ + /**/ + 18, /**/ -- hundred-and-one symptoms of being an internet addict: 25. You believe nothing looks sexier than a man in boxer shorts illuminated only by a 17" inch svga monitor. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///