procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

; Fix last change in inclusion of byteswap.h header

Browse source 
* src/w32uniscribe.c (w32hb_get_font_table): Avoid warning due to
redefinition of 'bswap_32'.
This commit is contained in:
Eli Zaretskii 2024-03-30 10:52:00 +03:00
parent d422e985ff
commit 06882a2d76
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/w32uniscribe.c
View file

@ -33,11 +33,6 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
#ifdef HAVE_HARFBUZZ
# include <hb.h>
# include <hb-ot.h> /* for hb_ot_font_set_funcs */
# if GNUC_PREREQ (4, 3, 0)
# define bswap_32(v) __builtin_bswap32(v)
# else
# include <byteswap.h>
# endif
#endif
#include "lisp.h"
@ -1270,7 +1265,11 @@ w32hb_get_font_table (hb_face_t *face, hb_tag_t tag, void *data)
HFONT old_font = SelectObject (context, (HFONT) data);
char *font_data = NULL;
DWORD font_data_size = 0, val;
#if GNUC_PREREQ (4, 3, 0)
DWORD table = __builtin_bswap32 (tag);
#else
DWORD table = bswap_32 (tag);
#endif
hb_blob_t *blob = NULL;
val = GetFontData (context, table, 0, font_data, font_data_size);