1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
|
To: vim_dev@googlegroups.com
Subject: Patch 7.4.228
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.4.228
Problem: Compiler warnings when building with Python 3.2.
Solution: Make type cast depend on Python version. (Ken Takata)
Files: src/if_py_both.h, src/if_python.c, src/if_python3.c
*** ../vim-7.4.227/src/if_py_both.h 2014-03-08 16:13:39.115462069 +0100
--- src/if_py_both.h 2014-03-30 15:58:40.948518929 +0200
***************
*** 2328,2334 ****
{
Py_ssize_t start, stop, step, slicelen;
! if (PySlice_GetIndicesEx((PySliceObject *)idx, ListLength(self),
&start, &stop, &step, &slicelen) < 0)
return NULL;
return ListSlice(self, start, step, slicelen);
--- 2328,2334 ----
{
Py_ssize_t start, stop, step, slicelen;
! if (PySlice_GetIndicesEx((PySliceObject_T *)idx, ListLength(self),
&start, &stop, &step, &slicelen) < 0)
return NULL;
return ListSlice(self, start, step, slicelen);
***************
*** 2618,2624 ****
{
Py_ssize_t start, stop, step, slicelen;
! if (PySlice_GetIndicesEx((PySliceObject *)idx, ListLength(self),
&start, &stop, &step, &slicelen) < 0)
return -1;
return ListAssSlice(self, start, step, slicelen,
--- 2618,2624 ----
{
Py_ssize_t start, stop, step, slicelen;
! if (PySlice_GetIndicesEx((PySliceObject_T *)idx, ListLength(self),
&start, &stop, &step, &slicelen) < 0)
return -1;
return ListAssSlice(self, start, step, slicelen,
*** ../vim-7.4.227/src/if_python.c 2014-02-23 22:52:33.368764715 +0100
--- src/if_python.c 2014-03-30 15:58:35.768518850 +0200
***************
*** 803,808 ****
--- 803,810 ----
# define PY_STRSAVE(s) ((char_u *) py_memsave(s, STRLEN(s) + 1))
#endif
+ typedef PySliceObject PySliceObject_T;
+
/*
* Include the code shared with if_python3.c
*/
*** ../vim-7.4.227/src/if_python3.c 2014-01-14 19:35:49.000000000 +0100
--- src/if_python3.c 2014-03-30 15:59:24.752519600 +0200
***************
*** 100,105 ****
--- 100,115 ----
#define PyIntArgFunc ssizeargfunc
#define PyIntObjArgProc ssizeobjargproc
+ /*
+ * PySlice_GetIndicesEx(): first argument type changed from PySliceObject
+ * to PyObject in Python 3.2 or later.
+ */
+ #if PY_VERSION_HEX >= 0x030200f0
+ typedef PyObject PySliceObject_T;
+ #else
+ typedef PySliceObject PySliceObject_T;
+ #endif
+
#if defined(DYNAMIC_PYTHON3) || defined(PROTO)
# ifndef WIN3264
***************
*** 294,300 ****
static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t);
static int (*py3_PyMapping_Check)(PyObject *);
static PyObject* (*py3_PyMapping_Keys)(PyObject *);
! static int (*py3_PySlice_GetIndicesEx)(PySliceObject *r, Py_ssize_t length,
Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step,
Py_ssize_t *slicelen);
static PyObject* (*py3_PyErr_NoMemory)(void);
--- 304,310 ----
static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t);
static int (*py3_PyMapping_Check)(PyObject *);
static PyObject* (*py3_PyMapping_Keys)(PyObject *);
! static int (*py3_PySlice_GetIndicesEx)(PySliceObject_T *r, Py_ssize_t length,
Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step,
Py_ssize_t *slicelen);
static PyObject* (*py3_PyErr_NoMemory)(void);
***************
*** 1190,1196 ****
if (CheckBuffer((BufferObject *) self))
return NULL;
! if (PySlice_GetIndicesEx((PySliceObject *)idx,
(Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
&start, &stop,
&step, &slicelen) < 0)
--- 1200,1206 ----
if (CheckBuffer((BufferObject *) self))
return NULL;
! if (PySlice_GetIndicesEx((PySliceObject_T *)idx,
(Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
&start, &stop,
&step, &slicelen) < 0)
***************
*** 1222,1228 ****
if (CheckBuffer((BufferObject *) self))
return -1;
! if (PySlice_GetIndicesEx((PySliceObject *)idx,
(Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
&start, &stop,
&step, &slicelen) < 0)
--- 1232,1238 ----
if (CheckBuffer((BufferObject *) self))
return -1;
! if (PySlice_GetIndicesEx((PySliceObject_T *)idx,
(Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
&start, &stop,
&step, &slicelen) < 0)
***************
*** 1306,1312 ****
{
Py_ssize_t start, stop, step, slicelen;
! if (PySlice_GetIndicesEx((PySliceObject *)idx,
((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
&start, &stop,
&step, &slicelen) < 0)
--- 1316,1322 ----
{
Py_ssize_t start, stop, step, slicelen;
! if (PySlice_GetIndicesEx((PySliceObject_T *)idx,
((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
&start, &stop,
&step, &slicelen) < 0)
***************
*** 1333,1339 ****
{
Py_ssize_t start, stop, step, slicelen;
! if (PySlice_GetIndicesEx((PySliceObject *)idx,
((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
&start, &stop,
&step, &slicelen) < 0)
--- 1343,1349 ----
{
Py_ssize_t start, stop, step, slicelen;
! if (PySlice_GetIndicesEx((PySliceObject_T *)idx,
((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
&start, &stop,
&step, &slicelen) < 0)
*** ../vim-7.4.227/src/version.c 2014-03-28 21:58:17.878256914 +0100
--- src/version.c 2014-03-30 15:52:27.784513211 +0200
***************
*** 736,737 ****
--- 736,739 ----
{ /* Add new patch number below this line */
+ /**/
+ 228,
/**/
--
The average life of an organization chart is six months. You can safely
ignore any order from your boss that would take six months to complete.
(Scott Adams - The Dilbert principle)
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
