projects / people / arne_f / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| c6060300 MT |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.309 | |
| 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.309 (after 7.3.307) | |
| 11 | Problem: Warnings for pointer types. | |
| 12 | Solution: Change PySliceObject to PyObject. | |
| 13 | Files: src/if_python3.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.308/src/if_python3.c 2011-09-14 15:01:54.000000000 +0200 | |
| 17 | --- src/if_python3.c 2011-09-14 15:30:45.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 1030,1036 **** | |
| 20 | } else if (PySlice_Check(idx)) { | |
| 21 | Py_ssize_t start, stop, step, slicelen; | |
| 22 | ||
| 23 | ! if (PySlice_GetIndicesEx((PySliceObject *)idx, | |
| 24 | (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count+1, | |
| 25 | &start, &stop, | |
| 26 | &step, &slicelen) < 0) { | |
| 27 | --- 1030,1036 ---- | |
| 28 | } else if (PySlice_Check(idx)) { | |
| 29 | Py_ssize_t start, stop, step, slicelen; | |
| 30 | ||
| 31 | ! if (PySlice_GetIndicesEx((PyObject *)idx, | |
| 32 | (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count+1, | |
| 33 | &start, &stop, | |
| 34 | &step, &slicelen) < 0) { | |
| 35 | *************** | |
| 36 | *** 1054,1060 **** | |
| 37 | } else if (PySlice_Check(idx)) { | |
| 38 | Py_ssize_t start, stop, step, slicelen; | |
| 39 | ||
| 40 | ! if (PySlice_GetIndicesEx((PySliceObject *)idx, | |
| 41 | (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count+1, | |
| 42 | &start, &stop, | |
| 43 | &step, &slicelen) < 0) { | |
| 44 | --- 1054,1060 ---- | |
| 45 | } else if (PySlice_Check(idx)) { | |
| 46 | Py_ssize_t start, stop, step, slicelen; | |
| 47 | ||
| 48 | ! if (PySlice_GetIndicesEx((PyObject *)idx, | |
| 49 | (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count+1, | |
| 50 | &start, &stop, | |
| 51 | &step, &slicelen) < 0) { | |
| 52 | *************** | |
| 53 | *** 1142,1148 **** | |
| 54 | } else if (PySlice_Check(idx)) { | |
| 55 | Py_ssize_t start, stop, step, slicelen; | |
| 56 | ||
| 57 | ! if (PySlice_GetIndicesEx((PySliceObject *)idx, | |
| 58 | ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, | |
| 59 | &start, &stop, | |
| 60 | &step, &slicelen) < 0) { | |
| 61 | --- 1142,1148 ---- | |
| 62 | } else if (PySlice_Check(idx)) { | |
| 63 | Py_ssize_t start, stop, step, slicelen; | |
| 64 | ||
| 65 | ! if (PySlice_GetIndicesEx((PyObject *)idx, | |
| 66 | ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, | |
| 67 | &start, &stop, | |
| 68 | &step, &slicelen) < 0) { | |
| 69 | *************** | |
| 70 | *** 1164,1170 **** | |
| 71 | } else if (PySlice_Check(idx)) { | |
| 72 | Py_ssize_t start, stop, step, slicelen; | |
| 73 | ||
| 74 | ! if (PySlice_GetIndicesEx((PySliceObject *)idx, | |
| 75 | ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, | |
| 76 | &start, &stop, | |
| 77 | &step, &slicelen) < 0) { | |
| 78 | --- 1164,1170 ---- | |
| 79 | } else if (PySlice_Check(idx)) { | |
| 80 | Py_ssize_t start, stop, step, slicelen; | |
| 81 | ||
| 82 | ! if (PySlice_GetIndicesEx((PyObject *)idx, | |
| 83 | ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, | |
| 84 | &start, &stop, | |
| 85 | &step, &slicelen) < 0) { | |
| 86 | *** ../vim-7.3.308/src/version.c 2011-09-14 15:39:26.000000000 +0200 | |
| 87 | --- src/version.c 2011-09-14 15:40:17.000000000 +0200 | |
| 88 | *************** | |
| 89 | *** 711,712 **** | |
| 90 | --- 711,714 ---- | |
| 91 | { /* Add new patch number below this line */ | |
| 92 | + /**/ | |
| 93 | + 309, | |
| 94 | /**/ | |
| 95 | ||
| 96 | -- | |
| 97 | Never enter the boss's office unless it's absolutely necessary. Every boss | |
| 98 | saves one corner of the desk for useless assignments that are doled out like | |
| 99 | Halloween candy to each visitor. | |
| 100 | (Scott Adams - The Dilbert principle) | |
| 101 | ||
| 102 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 103 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 104 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 105 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |