projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 717fd8f6 AF |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.090 (extra) | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 6.2.090 (extra) | |
| 11 | Problem: Win32: MingW compiler complains about #pragmas. (Bill McCarthy) | |
| 12 | Solution: Put an #ifdef around the #pragmas. | |
| 13 | Files: src/os_win32.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-6.2.089/src/os_win32.c Sun Jul 27 14:29:34 2003 | |
| 17 | --- src/os_win32.c Fri Sep 5 22:52:38 2003 | |
| 18 | *************** | |
| 19 | *** 504,513 **** | |
| 20 | }; | |
| 21 | ||
| 22 | ||
| 23 | // The ToAscii bug destroys several registers. Need to turn off optimization | |
| 24 | // or the GetConsoleKeyboardLayoutName hack will fail in non-debug versions | |
| 25 | ! | |
| 26 | ! #pragma optimize("", off) | |
| 27 | ||
| 28 | #if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__CYGWIN__) | |
| 29 | # define AChar AsciiChar | |
| 30 | --- 504,514 ---- | |
| 31 | }; | |
| 32 | ||
| 33 | ||
| 34 | + #ifdef _MSC_VER | |
| 35 | // The ToAscii bug destroys several registers. Need to turn off optimization | |
| 36 | // or the GetConsoleKeyboardLayoutName hack will fail in non-debug versions | |
| 37 | ! # pragma optimize("", off) | |
| 38 | ! #endif | |
| 39 | ||
| 40 | #if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__CYGWIN__) | |
| 41 | # define AChar AsciiChar | |
| 42 | *************** | |
| 43 | *** 573,587 **** | |
| 44 | return s_iIsDead; | |
| 45 | } | |
| 46 | ||
| 47 | /* MUST switch optimization on again here, otherwise a call to | |
| 48 | * decode_key_event() may crash (e.g. when hitting caps-lock) */ | |
| 49 | ! #pragma optimize("", on) | |
| 50 | ||
| 51 | ! #if (_MSC_VER < 1100) | |
| 52 | /* MUST turn off global optimisation for this next function, or | |
| 53 | * pressing ctrl-minus in insert mode crashes Vim when built with | |
| 54 | * VC4.1. -- negri. */ | |
| 55 | ! #pragma optimize("g", off) | |
| 56 | #endif | |
| 57 | ||
| 58 | static BOOL g_fJustGotFocus = FALSE; | |
| 59 | --- 574,590 ---- | |
| 60 | return s_iIsDead; | |
| 61 | } | |
| 62 | ||
| 63 | + #ifdef _MSC_VER | |
| 64 | /* MUST switch optimization on again here, otherwise a call to | |
| 65 | * decode_key_event() may crash (e.g. when hitting caps-lock) */ | |
| 66 | ! # pragma optimize("", on) | |
| 67 | ||
| 68 | ! # if (_MSC_VER < 1100) | |
| 69 | /* MUST turn off global optimisation for this next function, or | |
| 70 | * pressing ctrl-minus in insert mode crashes Vim when built with | |
| 71 | * VC4.1. -- negri. */ | |
| 72 | ! # pragma optimize("g", off) | |
| 73 | ! # endif | |
| 74 | #endif | |
| 75 | ||
| 76 | static BOOL g_fJustGotFocus = FALSE; | |
| 77 | *************** | |
| 78 | *** 691,697 **** | |
| 79 | ||
| 80 | return (*pch != NUL); | |
| 81 | } | |
| 82 | ! #pragma optimize("", on) | |
| 83 | #endif /* FEAT_GUI_W32 */ | |
| 84 | ||
| 85 | ||
| 86 | --- 694,704 ---- | |
| 87 | ||
| 88 | return (*pch != NUL); | |
| 89 | } | |
| 90 | ! | |
| 91 | ! #ifdef _MSC_VER | |
| 92 | ! # pragma optimize("", on) | |
| 93 | ! #endif | |
| 94 | ! | |
| 95 | #endif /* FEAT_GUI_W32 */ | |
| 96 | ||
| 97 | ||
| 98 | *** ../vim-6.2.089/src/version.c Thu Sep 11 21:46:06 2003 | |
| 99 | --- src/version.c Thu Sep 11 21:48:24 2003 | |
| 100 | *************** | |
| 101 | *** 632,633 **** | |
| 102 | --- 632,635 ---- | |
| 103 | { /* Add new patch number below this line */ | |
| 104 | + /**/ | |
| 105 | + 90, | |
| 106 | /**/ | |
| 107 | ||
| 108 | -- | |
| 109 | Zen Microsystems: we're the om in .commmmmmmmm | |
| 110 | ||
| 111 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 112 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 113 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 114 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |