home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 7.3 / 7.3.1040 < prev    next >
Encoding:
Internet Message Format  |  2013-05-28  |  10.9 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.3.1040
  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.1040
  11. Problem:    Python: Problems with debugging dynamic build.
  12. Solution:   Python patch 1. (ZyX)
  13. Files:      src/if_python.c, src/if_python3.c
  14.  
  15.  
  16. *** ../vim-7.3.1039/src/if_python.c    2013-05-21 22:23:51.000000000 +0200
  17. --- src/if_python.c    2013-05-29 21:32:46.000000000 +0200
  18. ***************
  19. *** 21,26 ****
  20. --- 21,35 ----
  21.   
  22.   #include <limits.h>
  23.   
  24. + /* uncomment this if used with the debug version of python.
  25. +  * Checked on 2.7.4. */
  26. + /* #define Py_DEBUG */
  27. + /* Note: most of time you can add -DPy_DEBUG to CFLAGS in place of uncommenting 
  28. +  */
  29. + /* uncomment this if used with the debug version of python, but without its 
  30. +  * allocator */
  31. + /* #define Py_DEBUG_NO_PYMALLOC */
  32. + 
  33.   /* Python.h defines _POSIX_THREADS itself (if needed) */
  34.   #ifdef _POSIX_THREADS
  35.   # undef _POSIX_THREADS
  36. ***************
  37. *** 240,247 ****
  38.   #  define PyType_IsSubtype dll_PyType_IsSubtype
  39.   # endif
  40.   # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02030000
  41. ! #  define PyObject_Malloc dll_PyObject_Malloc
  42. ! #  define PyObject_Free dll_PyObject_Free
  43.   # endif
  44.   # ifdef PY_USE_CAPSULE
  45.   #  define PyCapsule_New dll_PyCapsule_New
  46. --- 249,266 ----
  47.   #  define PyType_IsSubtype dll_PyType_IsSubtype
  48.   # endif
  49.   # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02030000
  50. ! #  ifdef Py_DEBUG
  51. ! #   define _Py_NegativeRefcount dll__Py_NegativeRefcount
  52. ! #   define _Py_RefTotal (*dll__Py_RefTotal)
  53. ! #   define _Py_Dealloc dll__Py_Dealloc
  54. ! #  endif
  55. ! #  if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC)
  56. ! #   define _PyObject_DebugMalloc dll__PyObject_DebugMalloc
  57. ! #   define _PyObject_DebugFree dll__PyObject_DebugFree
  58. ! #  else
  59. ! #   define PyObject_Malloc dll_PyObject_Malloc
  60. ! #   define PyObject_Free dll_PyObject_Free
  61. ! #  endif
  62.   # endif
  63.   # ifdef PY_USE_CAPSULE
  64.   #  define PyCapsule_New dll_PyCapsule_New
  65. ***************
  66. *** 350,357 ****
  67. --- 369,386 ----
  68.   static int (*dll_PyType_IsSubtype)(PyTypeObject *, PyTypeObject *);
  69.   # endif
  70.   # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02030000
  71. + #  ifdef Py_DEBUG
  72. + static void (*dll__Py_NegativeRefcount)(const char *fname, int lineno, PyObject *op);
  73. + static Py_ssize_t* dll__Py_RefTotal;
  74. + static void (*dll__Py_Dealloc)(PyObject *obj);
  75. + #  endif
  76. + #  if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC)
  77. + static void (*dll__PyObject_DebugFree)(void*);
  78. + static void* (*dll__PyObject_DebugMalloc)(size_t);
  79. + #  else
  80.   static void* (*dll_PyObject_Malloc)(size_t);
  81.   static void (*dll_PyObject_Free)(void*);
  82. + #  endif
  83.   # endif
  84.   # ifdef PY_USE_CAPSULE
  85.   static PyObject* (*dll_PyCapsule_New)(void *, char *, PyCapsule_Destructor);
  86. ***************
  87. *** 469,480 ****
  88.       {"PyType_Type", (PYTHON_PROC*)&dll_PyType_Type},
  89.       {"PyType_Ready", (PYTHON_PROC*)&dll_PyType_Ready},
  90.       {"Py_FindMethod", (PYTHON_PROC*)&dll_Py_FindMethod},
  91. - # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02050000 \
  92. -     && SIZEOF_SIZE_T != SIZEOF_INT
  93. -     {"Py_InitModule4_64", (PYTHON_PROC*)&dll_Py_InitModule4},
  94. - # else
  95. -     {"Py_InitModule4", (PYTHON_PROC*)&dll_Py_InitModule4},
  96. - # endif
  97.       {"Py_SetPythonHome", (PYTHON_PROC*)&dll_Py_SetPythonHome},
  98.       {"Py_Initialize", (PYTHON_PROC*)&dll_Py_Initialize},
  99.       {"Py_Finalize", (PYTHON_PROC*)&dll_Py_Finalize},
  100. --- 498,503 ----
  101. ***************
  102. *** 496,503 ****
  103. --- 519,550 ----
  104.       {"PyType_IsSubtype", (PYTHON_PROC*)&dll_PyType_IsSubtype},
  105.   # endif
  106.   # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02030000
  107. + #  ifdef Py_DEBUG
  108. +     {"_Py_NegativeRefcount", (PYTHON_PROC*)&dll__Py_NegativeRefcount},
  109. +     {"_Py_RefTotal", (PYTHON_PROC*)&dll__Py_RefTotal},
  110. +     {"_Py_Dealloc", (PYTHON_PROC*)&dll__Py_Dealloc},
  111. + #  endif
  112. + #  if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC)
  113. +     {"_PyObject_DebugFree", (PYTHON_PROC*)&dll__PyObject_DebugFree},
  114. +     {"_PyObject_DebugMalloc", (PYTHON_PROC*)&dll__PyObject_DebugMalloc},
  115. + #  else
  116.       {"PyObject_Malloc", (PYTHON_PROC*)&dll_PyObject_Malloc},
  117.       {"PyObject_Free", (PYTHON_PROC*)&dll_PyObject_Free},
  118. + #  endif
  119. + # endif
  120. + # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02050000 \
  121. +     && SIZEOF_SIZE_T != SIZEOF_INT
  122. + #  ifdef Py_DEBUG
  123. +     {"Py_InitModule4TraceRefs_64", (PYTHON_PROC*)&dll_Py_InitModule4},
  124. + #  else
  125. +     {"Py_InitModule4_64", (PYTHON_PROC*)&dll_Py_InitModule4},
  126. + #  endif
  127. + # else
  128. + #  ifdef Py_DEBUG
  129. +     {"Py_InitModule4TraceRefs", (PYTHON_PROC*)&dll_Py_InitModule4},
  130. + #  else
  131. +     {"Py_InitModule4", (PYTHON_PROC*)&dll_Py_InitModule4},
  132. + #  endif
  133.   # endif
  134.   # ifdef PY_USE_CAPSULE
  135.       {"PyCapsule_New", (PYTHON_PROC*)&dll_PyCapsule_New},
  136. *** ../vim-7.3.1039/src/if_python3.c    2013-05-21 22:23:51.000000000 +0200
  137. --- src/if_python3.c    2013-05-29 21:32:46.000000000 +0200
  138. ***************
  139. *** 24,29 ****
  140. --- 24,34 ----
  141.   
  142.   /* uncomment this if used with the debug version of python */
  143.   /* #define Py_DEBUG */
  144. + /* Note: most of time you can add -DPy_DEBUG to CFLAGS in place of uncommenting 
  145. +  */
  146. + /* uncomment this if used with the debug version of python, but without its 
  147. +  * allocator */
  148. + /* #define Py_DEBUG_NO_PYMALLOC */
  149.   
  150.   #include "vim.h"
  151.   
  152. ***************
  153. *** 207,212 ****
  154. --- 212,222 ----
  155.   #  define _Py_NegativeRefcount py3__Py_NegativeRefcount
  156.   #  define _Py_RefTotal (*py3__Py_RefTotal)
  157.   #  define _Py_Dealloc py3__Py_Dealloc
  158. + #  define PyModule_Create2TraceRefs py3_PyModule_Create2TraceRefs
  159. + # else
  160. + #  define PyModule_Create2 py3_PyModule_Create2
  161. + # endif
  162. + # if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC)
  163.   #  define _PyObject_DebugMalloc py3__PyObject_DebugMalloc
  164.   #  define _PyObject_DebugFree py3__PyObject_DebugFree
  165.   # else
  166. ***************
  167. *** 218,224 ****
  168.   # define PyObject_GC_UnTrack py3_PyObject_GC_UnTrack
  169.   # define PyType_GenericAlloc py3_PyType_GenericAlloc
  170.   # define PyType_GenericNew py3_PyType_GenericNew
  171. - # define PyModule_Create2 py3_PyModule_Create2
  172.   # undef PyUnicode_FromString
  173.   # define PyUnicode_FromString py3_PyUnicode_FromString
  174.   # undef PyUnicode_Decode
  175. --- 228,233 ----
  176. ***************
  177. *** 227,233 ****
  178.   # define PyCapsule_New py3_PyCapsule_New
  179.   # define PyCapsule_GetPointer py3_PyCapsule_GetPointer
  180.   
  181. ! # ifdef Py_DEBUG
  182.   #  undef PyObject_NEW
  183.   #  define PyObject_NEW(type, typeobj) \
  184.   ( (type *) PyObject_Init( \
  185. --- 236,242 ----
  186.   # define PyCapsule_New py3_PyCapsule_New
  187.   # define PyCapsule_GetPointer py3_PyCapsule_GetPointer
  188.   
  189. ! # if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC)
  190.   #  undef PyObject_NEW
  191.   #  define PyObject_NEW(type, typeobj) \
  192.   ( (type *) PyObject_Init( \
  193. ***************
  194. *** 317,323 ****
  195.   static PyObject* (*py3_PyFloat_FromDouble)(double num);
  196.   static double (*py3_PyFloat_AsDouble)(PyObject *);
  197.   static PyObject* (*py3_PyObject_GenericGetAttr)(PyObject *obj, PyObject *name);
  198. - static PyObject* (*py3_PyModule_Create2)(struct PyModuleDef* module, int module_api_version);
  199.   static PyObject* (*py3_PyType_GenericAlloc)(PyTypeObject *type, Py_ssize_t nitems);
  200.   static PyObject* (*py3_PyType_GenericNew)(PyTypeObject *type, PyObject *args, PyObject *kwds);
  201.   static PyTypeObject* py3_PyType_Type;
  202. --- 326,331 ----
  203. ***************
  204. *** 328,341 ****
  205.   static PyObject* (*py3_PyCapsule_New)(void *, char *, PyCapsule_Destructor);
  206.   static void* (*py3_PyCapsule_GetPointer)(PyObject *, char *);
  207.   # ifdef Py_DEBUG
  208. !     static void (*py3__Py_NegativeRefcount)(const char *fname, int lineno, PyObject *op);
  209. !     static Py_ssize_t* py3__Py_RefTotal;
  210. !     static void (*py3__Py_Dealloc)(PyObject *obj);
  211. !     static void (*py3__PyObject_DebugFree)(void*);
  212. !     static void* (*py3__PyObject_DebugMalloc)(size_t);
  213.   # else
  214. !     static void (*py3_PyObject_Free)(void*);
  215. !     static void* (*py3_PyObject_Malloc)(size_t);
  216.   # endif
  217.   static PyObject*(*py3__PyObject_GC_New)(PyTypeObject *);
  218.   static void(*py3_PyObject_GC_Del)(void *);
  219. --- 336,354 ----
  220.   static PyObject* (*py3_PyCapsule_New)(void *, char *, PyCapsule_Destructor);
  221.   static void* (*py3_PyCapsule_GetPointer)(PyObject *, char *);
  222.   # ifdef Py_DEBUG
  223. ! static void (*py3__Py_NegativeRefcount)(const char *fname, int lineno, PyObject *op);
  224. ! static Py_ssize_t* py3__Py_RefTotal;
  225. ! static void (*py3__Py_Dealloc)(PyObject *obj);
  226. ! static PyObject* (*py3_PyModule_Create2TraceRefs)(struct PyModuleDef* module, int module_api_version);
  227. ! # else
  228. ! static PyObject* (*py3_PyModule_Create2)(struct PyModuleDef* module, int module_api_version);
  229. ! # endif
  230. ! # if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC)
  231. ! static void (*py3__PyObject_DebugFree)(void*);
  232. ! static void* (*py3__PyObject_DebugMalloc)(size_t);
  233.   # else
  234. ! static void (*py3_PyObject_Free)(void*);
  235. ! static void* (*py3_PyObject_Malloc)(size_t);
  236.   # endif
  237.   static PyObject*(*py3__PyObject_GC_New)(PyTypeObject *);
  238.   static void(*py3_PyObject_GC_Del)(void *);
  239. ***************
  240. *** 451,457 ****
  241.       {"PyFloat_FromDouble", (PYTHON_PROC*)&py3_PyFloat_FromDouble},
  242.       {"PyFloat_AsDouble", (PYTHON_PROC*)&py3_PyFloat_AsDouble},
  243.       {"PyObject_GenericGetAttr", (PYTHON_PROC*)&py3_PyObject_GenericGetAttr},
  244. -     {"PyModule_Create2", (PYTHON_PROC*)&py3_PyModule_Create2},
  245.       {"PyType_GenericAlloc", (PYTHON_PROC*)&py3_PyType_GenericAlloc},
  246.       {"PyType_GenericNew", (PYTHON_PROC*)&py3_PyType_GenericNew},
  247.       {"PyType_Type", (PYTHON_PROC*)&py3_PyType_Type},
  248. --- 464,469 ----
  249. ***************
  250. *** 463,468 ****
  251. --- 475,485 ----
  252.       {"_Py_NegativeRefcount", (PYTHON_PROC*)&py3__Py_NegativeRefcount},
  253.       {"_Py_RefTotal", (PYTHON_PROC*)&py3__Py_RefTotal},
  254.       {"_Py_Dealloc", (PYTHON_PROC*)&py3__Py_Dealloc},
  255. +     {"PyModule_Create2TraceRefs", (PYTHON_PROC*)&py3_PyModule_Create2TraceRefs},
  256. + # else
  257. +     {"PyModule_Create2", (PYTHON_PROC*)&py3_PyModule_Create2},
  258. + # endif
  259. + # if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC)
  260.       {"_PyObject_DebugFree", (PYTHON_PROC*)&py3__PyObject_DebugFree},
  261.       {"_PyObject_DebugMalloc", (PYTHON_PROC*)&py3__PyObject_DebugMalloc},
  262.   # else
  263. ***************
  264. *** 656,662 ****
  265.       static void
  266.   call_PyObject_Free(void *p)
  267.   {
  268. ! #ifdef Py_DEBUG
  269.       _PyObject_DebugFree(p);
  270.   #else
  271.       PyObject_Free(p);
  272. --- 673,679 ----
  273.       static void
  274.   call_PyObject_Free(void *p)
  275.   {
  276. ! #if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC)
  277.       _PyObject_DebugFree(p);
  278.   #else
  279.       PyObject_Free(p);
  280. *** ../vim-7.3.1039/src/version.c    2013-05-29 21:14:37.000000000 +0200
  281. --- src/version.c    2013-05-29 21:32:32.000000000 +0200
  282. ***************
  283. *** 730,731 ****
  284. --- 730,733 ----
  285.   {   /* Add new patch number below this line */
  286. + /**/
  287. +     1040,
  288.   /**/
  289.  
  290. -- 
  291. hundred-and-one symptoms of being an internet addict:
  292. 17. You turn on your intercom when leaving the room so you can hear if new
  293.     e-mail arrives.
  294.  
  295.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  296. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  297. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  298.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  299.