Mercurial > vim
view src/xpm_w32.c @ 33583:123acdc8e64c v9.0.2036
patch 9.0.2036: if_python: rework python3.12 build dependency
Commit: https://github.com/vim/vim/commit/396058acd0cc66e5071d052e03d2067b134952af
Author: Yee Cheng Chin <ychin.git@gmail.com>
Date: Tue Oct 17 10:38:11 2023 +0200
patch 9.0.2036: if_python: rework python3.12 build dependency
Problem: if_python: rework python3.12 build dependency
(after 9.0.1996)
Solution: use PyTuple_Size instead of inlining the Py_SIZE
into the Vim code base
Use a simpler fix for Python 3.12 build issues
Python 3.12 introduced link dependencies to their `Py_SIZE()` inline
function, which #13290 fixed by copying the inline function to Vim's
Python binding code. This works but it's fragile, as a future update may
change the implementation of `Py_SIZE` and there is no way for us to
know.
The reason we need `Py_SIZE` to begin with is that we use
`PyTuple_GET_SIZE()` which calls that. Just fix it by mapping that to
(confusingly similarly named) `PyTuple_Size()`, which we already do in
the stable ABI implementation. There's a minor performance cost in that
it's not inlined and it does error checking but that's fine as we only
call this function rarely (in an error handler).
related: #13290
closes: #13359
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 17 Oct 2023 10:45:04 +0200 |
parents | 15539899a112 |
children |
line wrap: on
line source
/* vi:set ts=8 sts=4 sw=4 noet: * * Load XPM image. * * This function is placed in separate file because Xpm headers conflict with * Vim ones :( * * Written by Sergey Khorev. * http://iamphet.nm.ru/vim/index.html */ #ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN #endif #include <windows.h> #include "xpm_w32.h" // Engage Windows support in libXpm #define FOR_MSW #include "xpm.h" /* * Tries to load an Xpm image from the file "filename". * Returns -1 on failure. * Returns 0 on success and stores image and mask BITMAPS in "hImage" and * "hShape". */ int LoadXpmImage( char *filename, HBITMAP *hImage, HBITMAP *hShape) { XImage *img; // loaded image XImage *shp; // shapeimage XpmAttributes attr; int res; HDC hdc = CreateCompatibleDC(NULL); attr.valuemask = 0; res = XpmReadFileToImage(&hdc, filename, &img, &shp, &attr); DeleteDC(hdc); if (res < 0) return -1; if (shp == NULL) { if (img) XDestroyImage(img); return -1; } *hImage = img->bitmap; *hShape = shp->bitmap; return 0; }