1
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-28 23:09:59 +02:00

vlc_codec: use the preferred toolchain packing mode with MSVC

The Windows SDK and mingw-w64 5+ have a clean way to group packing blocks
together. mingw-w64 generates some bogus warning (clang) when using
packing from a header, so keep it to MSVC for now.
This commit is contained in:
Steve Lhomme 2023-01-30 09:12:24 +01:00
parent 96f9688a4c
commit 9cb9df5097

View File

@ -46,9 +46,12 @@ typedef GUID vlc_guid_t;
#ifdef HAVE_ATTRIBUTE_PACKED
# define ATTR_PACKED __attribute__((__packed__))
#elif defined(__SUNPRO_C) || defined(_MSC_VER)
#elif defined(__SUNPRO_C)
# pragma pack(1)
# define ATTR_PACKED
#elif defined(_MSC_VER)
# include <pshpack1.h>
# define ATTR_PACKED
#elif defined(__APPLE__)
# pragma pack(push, 1)
# define ATTR_PACKED
@ -142,8 +145,10 @@ ATTR_PACKED
} VLC_BITMAPINFOHEADER, *VLC_PBITMAPINFOHEADER, *VLC_LPBITMAPINFOHEADER;
#endif
#if defined(__SUNPRO_C) || defined(_MSC_VER)
#if defined(__SUNPRO_C)
# pragma pack()
#elif defined(_MSC_VER)
# include <poppack.h>
#elif defined(__APPLE__) && !defined(HAVE_ATTRIBUTE_PACKED)
# pragma pack(pop)
#endif