/libs/python/patches/const-methods.patch

https://github.com/gdw2/pycorn · Patch · 206 lines · 177 code · 29 blank · 0 comment · 0 complexity · ade5cbf98a8f34807d630ae53a9b4e71 MD5 · raw file 

    

  1. Index: Python-2.5.5/Include/methodobject.h
    2. 

  2. ===================================================================
    3. 

  3. --- Python-2.5.5.orig/Include/methodobject.h	2010-04-26 23:36:53.374633085 +0100
    4. 

  4. +++ Python-2.5.5/Include/methodobject.h	2010-04-26 23:37:11.095741063 +0100
    5. 

  5. @@ -46,7 +46,7 @@
    6. 

  6.  PyAPI_FUNC(PyObject *) Py_FindMethod(PyMethodDef[], PyObject *, const char *);
    7. 

  7.  
    8. 

  8.  #define PyCFunction_New(ML, SELF) PyCFunction_NewEx((ML), (SELF), NULL)
    9. 

  9. -PyAPI_FUNC(PyObject *) PyCFunction_NewEx(PyMethodDef *, PyObject *, 
    10. 

  10. +PyAPI_FUNC(PyObject *) PyCFunction_NewEx(const PyMethodDef *, PyObject *, 
    11. 

  11.  					 PyObject *);
    12. 

  12.  
    13. 

  13.  /* Flag passed to newmethodobject */
    14. 

  14. @@ -80,7 +80,7 @@
    15. 

  15.  
    16. 

  16.  typedef struct {
    17. 

  17.      PyObject_HEAD
    18. 

  18. -    PyMethodDef *m_ml; /* Description of the C function to call */
    19. 

  19. +    const PyMethodDef *m_ml; /* Description of the C function to call */
    20. 

  20.      PyObject    *m_self; /* Passed as 'self' arg to the C func, can be NULL */
    21. 

  21.      PyObject    *m_module; /* The __module__ attribute, can be anything */
    22. 

  22.  } PyCFunctionObject;
    23. 

  23. Index: Python-2.5.5/Include/modsupport.h
    24. 

  24. ===================================================================
    25. 

  25. --- Python-2.5.5.orig/Include/modsupport.h	2010-04-26 23:36:53.390634754 +0100
    26. 

  26. +++ Python-2.5.5/Include/modsupport.h	2010-04-26 23:37:11.103738267 +0100
    27. 

  27. @@ -113,7 +113,8 @@
    28. 

  28.   #endif
    29. 

  29.  #endif
    30. 

  30.  
    31. 

  31. -PyAPI_FUNC(PyObject *) Py_InitModule4(const char *name, PyMethodDef *methods,
    32. 

  32. +PyAPI_FUNC(PyObject *) Py_InitModule4(const char *name,
    33. 

  33. +                                      const PyMethodDef *methods,
    34. 

  34.                                        const char *doc, PyObject *self,
    35. 

  35.                                        int apiver);
    36. 

  36.  
    37. 

  37. Index: Python-2.5.5/Objects/methodobject.c
    38. 

  38. ===================================================================
    39. 

  39. --- Python-2.5.5.orig/Objects/methodobject.c	2010-04-26 23:36:53.486641844 +0100
    40. 

  40. +++ Python-2.5.5/Objects/methodobject.c	2010-04-26 23:37:11.103738267 +0100
    41. 

  41. @@ -7,7 +7,7 @@
    42. 

  42.  static PyCFunctionObject *free_list = NULL;
    43. 

  43.  
    44. 

  44.  PyObject *
    45. 

  45. -PyCFunction_NewEx(PyMethodDef *ml, PyObject *self, PyObject *module)
    46. 

  46. +PyCFunction_NewEx(const PyMethodDef *ml, PyObject *self, PyObject *module)
    47. 

  47.  {
    48. 

  48.  	PyCFunctionObject *op;
    49. 

  49.  	op = free_list;
    50. 

  50. Index: Python-2.5.5/Python/modsupport.c
    51. 

  51. ===================================================================
    52. 

  52. --- Python-2.5.5.orig/Python/modsupport.c	2010-04-26 23:36:53.470641589 +0100
    53. 

  53. +++ Python-2.5.5/Python/modsupport.c	2010-04-26 23:37:11.103738267 +0100
    54. 

  54. @@ -29,11 +29,11 @@
    55. 

  55.   This Python has API version %d, module %.100s has version %d.";
    56. 

  56.  
    57. 

  57.  PyObject *
    58. 

  58. -Py_InitModule4(const char *name, PyMethodDef *methods, const char *doc,
    59. 

  59. +Py_InitModule4(const char *name, const PyMethodDef *methods, const char *doc,
    60. 

  60.  	       PyObject *passthrough, int module_api_version)
    61. 

  61.  {
    62. 

  62.  	PyObject *m, *d, *v, *n;
    63. 

  63. -	PyMethodDef *ml;
    64. 

  64. +	const PyMethodDef *ml;
    65. 

  65.  	if (!Py_IsInitialized())
    66. 

  66.  	    Py_FatalError("Interpreter not initialized (version mismatch?)");
    67. 

  67.  	if (module_api_version != PYTHON_API_VERSION) {
    68. 

  68. Index: Python-2.5.5/Include/descrobject.h
    69. 

  69. ===================================================================
    70. 

  70. --- Python-2.5.5.orig/Include/descrobject.h	2010-04-26 23:36:53.438638816 +0100
    71. 

  71. +++ Python-2.5.5/Include/descrobject.h	2010-04-26 23:37:11.124552248 +0100
    72. 

  72. @@ -48,12 +48,12 @@
    73. 

  73.  
    74. 

  74.  typedef struct {
    75. 

  75.  	PyDescr_COMMON;
    76. 

  76. -	PyMethodDef *d_method;
    77. 

  77. +	const PyMethodDef *d_method;
    78. 

  78.  } PyMethodDescrObject;
    79. 

  79.  
    80. 

  80.  typedef struct {
    81. 

  81.  	PyDescr_COMMON;
    82. 

  82. -	struct PyMemberDef *d_member;
    83. 

  83. +	const struct PyMemberDef *d_member;
    84. 

  84.  } PyMemberDescrObject;
    85. 

  85.  
    86. 

  86.  typedef struct {
    87. 

  87. @@ -69,10 +69,11 @@
    88. 

  88.  
    89. 

  89.  PyAPI_DATA(PyTypeObject) PyWrapperDescr_Type;
    90. 

  90.  
    91. 

  91. -PyAPI_FUNC(PyObject *) PyDescr_NewMethod(PyTypeObject *, PyMethodDef *);
    92. 

  92. -PyAPI_FUNC(PyObject *) PyDescr_NewClassMethod(PyTypeObject *, PyMethodDef *);
    93. 

  93. +PyAPI_FUNC(PyObject *) PyDescr_NewMethod(PyTypeObject *, const PyMethodDef *);
    94. 

  94. +PyAPI_FUNC(PyObject *) PyDescr_NewClassMethod(PyTypeObject *,
    95. 

  95. +					       const PyMethodDef *);
    96. 

  96.  PyAPI_FUNC(PyObject *) PyDescr_NewMember(PyTypeObject *,
    97. 

  97. -					       struct PyMemberDef *);
    98. 

  98. +					       const struct PyMemberDef *);
    99. 

  99.  PyAPI_FUNC(PyObject *) PyDescr_NewGetSet(PyTypeObject *,
    100. 

  100.  					       struct PyGetSetDef *);
    101. 

  101.  PyAPI_FUNC(PyObject *) PyDescr_NewWrapper(PyTypeObject *,
    102. 

  102. Index: Python-2.5.5/Include/object.h
    103. 

  103. ===================================================================
    104. 

  104. --- Python-2.5.5.orig/Include/object.h	2010-04-26 23:36:53.422635629 +0100
    105. 

  105. +++ Python-2.5.5/Include/object.h	2010-04-26 23:37:11.124552248 +0100
    106. 

  106. @@ -314,8 +314,8 @@
    107. 

  107.  	iternextfunc tp_iternext;
    108. 

  108.  
    109. 

  109.  	/* Attribute descriptor and subclassing stuff */
    110. 

  110. -	struct PyMethodDef *tp_methods;
    111. 

  111. -	struct PyMemberDef *tp_members;
    112. 

  112. +	const struct PyMethodDef *tp_methods;
    113. 

  113. +	const struct PyMemberDef *tp_members;
    114. 

  114.  	struct PyGetSetDef *tp_getset;
    115. 

  115.  	struct _typeobject *tp_base;
    116. 

  116.  	PyObject *tp_dict;
    117. 

  117. Index: Python-2.5.5/Include/structmember.h
    118. 

  118. ===================================================================
    119. 

  119. --- Python-2.5.5.orig/Include/structmember.h	2010-04-26 23:36:53.402636104 +0100
    120. 

  120. +++ Python-2.5.5/Include/structmember.h	2010-04-26 23:37:11.124552248 +0100
    121. 

  121. @@ -83,8 +83,8 @@
    122. 

  122.  PyAPI_FUNC(int) PyMember_Set(char *, struct memberlist *, const char *, PyObject *);
    123. 

  123.  
    124. 

  124.  /* Current API, use this */
    125. 

  125. -PyAPI_FUNC(PyObject *) PyMember_GetOne(const char *, struct PyMemberDef *);
    126. 

  126. -PyAPI_FUNC(int) PyMember_SetOne(char *, struct PyMemberDef *, PyObject *);
    127. 

  127. +PyAPI_FUNC(PyObject *) PyMember_GetOne(const char *, const struct PyMemberDef *);
    128. 

  128. +PyAPI_FUNC(int) PyMember_SetOne(char *, const struct PyMemberDef *, PyObject *);
    129. 

  129.  
    130. 

  130.  
    131. 

  131.  #ifdef __cplusplus
    132. 

  132. Index: Python-2.5.5/Objects/descrobject.c
    133. 

  133. ===================================================================
    134. 

  134. --- Python-2.5.5.orig/Objects/descrobject.c	2010-04-26 23:36:53.502642858 +0100
    135. 

  135. +++ Python-2.5.5/Objects/descrobject.c	2010-04-26 23:37:11.124552248 +0100
    136. 

  136. @@ -591,7 +591,7 @@
    137. 

  137.  }
    138. 

  138.  
    139. 

  139.  PyObject *
    140. 

  140. -PyDescr_NewMethod(PyTypeObject *type, PyMethodDef *method)
    141. 

  141. +PyDescr_NewMethod(PyTypeObject *type, const PyMethodDef *method)
    142. 

  142.  {
    143. 

  143.  	PyMethodDescrObject *descr;
    144. 

  144.  
    145. 

  145. @@ -603,7 +603,7 @@
    146. 

  146.  }
    147. 

  147.  
    148. 

  148.  PyObject *
    149. 

  149. -PyDescr_NewClassMethod(PyTypeObject *type, PyMethodDef *method)
    150. 

  150. +PyDescr_NewClassMethod(PyTypeObject *type, const PyMethodDef *method)
    151. 

  151.  {
    152. 

  152.  	PyMethodDescrObject *descr;
    153. 

  153.  
    154. 

  154. @@ -615,7 +615,7 @@
    155. 

  155.  }
    156. 

  156.  
    157. 

  157.  PyObject *
    158. 

  158. -PyDescr_NewMember(PyTypeObject *type, PyMemberDef *member)
    159. 

  159. +PyDescr_NewMember(PyTypeObject *type, const PyMemberDef *member)
    160. 

  160.  {
    161. 

  161.  	PyMemberDescrObject *descr;
    162. 

  162.  
    163. 

  163. Index: Python-2.5.5/Objects/typeobject.c
    164. 

  164. ===================================================================
    165. 

  165. --- Python-2.5.5.orig/Objects/typeobject.c	2010-04-26 23:36:53.522643557 +0100
    166. 

  166. +++ Python-2.5.5/Objects/typeobject.c	2010-04-26 23:37:11.131742301 +0100
    167. 

  167. @@ -2931,7 +2931,7 @@
    168. 

  168.  /* Initialize the __dict__ in a type object */
    169. 

  169.  
    170. 

  170.  static int
    171. 

  171. -add_methods(PyTypeObject *type, PyMethodDef *meth)
    172. 

  172. +add_methods(PyTypeObject *type, const PyMethodDef *meth)
    173. 

  173.  {
    174. 

  174.  	PyObject *dict = type->tp_dict;
    175. 

  175.  
    176. 

  176. @@ -2968,7 +2968,7 @@
    177. 

  177.  }
    178. 

  178.  
    179. 

  179.  static int
    180. 

  180. -add_members(PyTypeObject *type, PyMemberDef *memb)
    181. 

  181. +add_members(PyTypeObject *type, const PyMemberDef *memb)
    182. 

  182.  {
    183. 

  183.  	PyObject *dict = type->tp_dict;
    184. 

  184.  
    185. 

  185. Index: Python-2.5.5/Python/structmember.c
    186. 

  186. ===================================================================
    187. 

  187. --- Python-2.5.5.orig/Python/structmember.c	2010-04-26 23:36:53.454639426 +0100
    188. 

  188. +++ Python-2.5.5/Python/structmember.c	2010-04-26 23:37:11.160727992 +0100
    189. 

  189. @@ -51,7 +51,7 @@
    190. 

  190.  }
    191. 

  191.  
    192. 

  192.  PyObject *
    193. 

  193. -PyMember_GetOne(const char *addr, PyMemberDef *l)
    194. 

  194. +PyMember_GetOne(const char *addr, const PyMemberDef *l)
    195. 

  195.  {
    196. 

  196.  	PyObject *v;
    197. 

  197.  	if ((l->flags & READ_RESTRICTED) &&
    198. 

  198. @@ -154,7 +154,7 @@
    199. 

  199.  }
    200. 

  200.  
    201. 

  201.  int
    202. 

  202. -PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
    203. 

  203. +PyMember_SetOne(char *addr, const PyMemberDef *l, PyObject *v)
    204. 

  204.  {
    205. 

  205.  	PyObject *oldv;
    206.