Skip to content

Commit 15fafbe

Browse files
avassalottiavassalotti
committed
Merged revisions 67970-67971 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r67970 | alexandre.vassalotti | 2008-12-27 20:52:58 -0500 (Sat, 27 Dec 2008) | 2 lines Fix name mangling of PyUnicode_ClearFreeList. ........ r67971 | alexandre.vassalotti | 2008-12-27 21:10:35 -0500 (Sat, 27 Dec 2008) | 2 lines Sort UCS-2/UCS-4 name mangling list. ........
1 parent 454636f commit 15fafbe

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

‎Include/unicodeobject.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ typedef PY_UNICODE_TYPE Py_UNICODE;
152152
# define PyUnicode_AsUnicode PyUnicodeUCS2_AsUnicode
153153
# define PyUnicode_AsUnicodeEscapeString PyUnicodeUCS2_AsUnicodeEscapeString
154154
# define PyUnicode_AsWideChar PyUnicodeUCS2_AsWideChar
155+
# define PyUnicode_ClearFreeList PyUnicodeUCS2_ClearFreelist
155156
# define PyUnicode_Compare PyUnicodeUCS2_Compare
156157
# define PyUnicode_Concat PyUnicodeUCS2_Concat
157158
# define PyUnicode_Append PyUnicodeUCS2_Append
@@ -185,13 +186,13 @@ typedef PY_UNICODE_TYPE Py_UNICODE;
185186
# define PyUnicode_Find PyUnicodeUCS2_Find
186187
# define PyUnicode_Format PyUnicodeUCS2_Format
187188
# define PyUnicode_FromEncodedObject PyUnicodeUCS2_FromEncodedObject
189+
# define PyUnicode_FromFormat PyUnicodeUCS2_FromFormat
190+
# define PyUnicode_FromFormatV PyUnicodeUCS2_FromFormatV
188191
# define PyUnicode_FromObject PyUnicodeUCS2_FromObject
189192
# define PyUnicode_FromOrdinal PyUnicodeUCS2_FromOrdinal
190-
# define PyUnicode_FromUnicode PyUnicodeUCS2_FromUnicode
191193
# define PyUnicode_FromString PyUnicodeUCS2_FromString
192194
# define PyUnicode_FromStringAndSize PyUnicodeUCS2_FromStringAndSize
193-
# define PyUnicode_FromFormatV PyUnicodeUCS2_FromFormatV
194-
# define PyUnicode_FromFormat PyUnicodeUCS2_FromFormat
195+
# define PyUnicode_FromUnicode PyUnicodeUCS2_FromUnicode
195196
# define PyUnicode_FromWideChar PyUnicodeUCS2_FromWideChar
196197
# define PyUnicode_GetDefaultEncoding PyUnicodeUCS2_GetDefaultEncoding
197198
# define PyUnicode_GetMax PyUnicodeUCS2_GetMax
@@ -213,7 +214,6 @@ typedef PY_UNICODE_TYPE Py_UNICODE;
213214
# define _PyUnicode_AsDefaultEncodedString _PyUnicodeUCS2_AsDefaultEncodedString
214215
# define _PyUnicode_Fini _PyUnicodeUCS2_Fini
215216
# define _PyUnicode_Init _PyUnicodeUCS2_Init
216-
# define PyUnicode_ClearFreeList PyUnicodeUCS2_ClearFreelist
217217
# define _PyUnicode_IsAlpha _PyUnicodeUCS2_IsAlpha
218218
# define _PyUnicode_IsDecimalDigit _PyUnicodeUCS2_IsDecimalDigit
219219
# define _PyUnicode_IsDigit _PyUnicodeUCS2_IsDigit
@@ -250,6 +250,7 @@ typedef PY_UNICODE_TYPE Py_UNICODE;
250250
# define PyUnicode_AsUnicode PyUnicodeUCS4_AsUnicode
251251
# define PyUnicode_AsUnicodeEscapeString PyUnicodeUCS4_AsUnicodeEscapeString
252252
# define PyUnicode_AsWideChar PyUnicodeUCS4_AsWideChar
253+
# define PyUnicode_ClearFreeList PyUnicodeUCS4_ClearFreelist
253254
# define PyUnicode_Compare PyUnicodeUCS4_Compare
254255
# define PyUnicode_Concat PyUnicodeUCS4_Concat
255256
# define PyUnicode_Append PyUnicodeUCS4_Append
@@ -283,13 +284,13 @@ typedef PY_UNICODE_TYPE Py_UNICODE;
283284
# define PyUnicode_Find PyUnicodeUCS4_Find
284285
# define PyUnicode_Format PyUnicodeUCS4_Format
285286
# define PyUnicode_FromEncodedObject PyUnicodeUCS4_FromEncodedObject
287+
# define PyUnicode_FromFormat PyUnicodeUCS4_FromFormat
288+
# define PyUnicode_FromFormatV PyUnicodeUCS4_FromFormatV
286289
# define PyUnicode_FromObject PyUnicodeUCS4_FromObject
287290
# define PyUnicode_FromOrdinal PyUnicodeUCS4_FromOrdinal
288-
# define PyUnicode_FromUnicode PyUnicodeUCS4_FromUnicode
289291
# define PyUnicode_FromString PyUnicodeUCS4_FromString
290292
# define PyUnicode_FromStringAndSize PyUnicodeUCS4_FromStringAndSize
291-
# define PyUnicode_FromFormatV PyUnicodeUCS4_FromFormatV
292-
# define PyUnicode_FromFormat PyUnicodeUCS4_FromFormat
293+
# define PyUnicode_FromUnicode PyUnicodeUCS4_FromUnicode
293294
# define PyUnicode_FromWideChar PyUnicodeUCS4_FromWideChar
294295
# define PyUnicode_GetDefaultEncoding PyUnicodeUCS4_GetDefaultEncoding
295296
# define PyUnicode_GetMax PyUnicodeUCS4_GetMax
@@ -311,7 +312,6 @@ typedef PY_UNICODE_TYPE Py_UNICODE;
311312
# define _PyUnicode_AsDefaultEncodedString _PyUnicodeUCS4_AsDefaultEncodedString
312313
# define _PyUnicode_Fini _PyUnicodeUCS4_Fini
313314
# define _PyUnicode_Init _PyUnicodeUCS4_Init
314-
# define PyUnicode_ClearFreeList PyUnicodeUCS2_ClearFreelist
315315
# define _PyUnicode_IsAlpha _PyUnicodeUCS4_IsAlpha
316316
# define _PyUnicode_IsDecimalDigit _PyUnicodeUCS4_IsDecimalDigit
317317
# define _PyUnicode_IsDigit _PyUnicodeUCS4_IsDigit

0 commit comments

Comments
 (0)