diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 10:32:09 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 11:29:16 -0300 |
| commit | 87865bf6c7001e6fd8c536a247f71a9a426c3bd0 (patch) | |
| tree | 1a97298933e784025f282c21cbd15b3ce2a84711 /libavutil | |
| parent | f87ad3a058bfee786e942106c5c3450c02a66d48 (diff) | |
| parent | abf1c058d1bd0ed1b820ea5e501a4484756f00b0 (diff) | |
| download | ffmpeg-87865bf6c7001e6fd8c536a247f71a9a426c3bd0.tar.gz | |
Merge commit 'abf1c058d1bd0ed1b820ea5e501a4484756f00b0'
* commit 'abf1c058d1bd0ed1b820ea5e501a4484756f00b0':
msvc: Properly specify dllexport for data symbols shared across dll boundaries
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/internal.h | 8 | ||||
| -rw-r--r-- | libavutil/xga_font_data.h | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h index 6f92f71e8e..c4bf1466ef 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -64,9 +64,13 @@ #endif #if defined(_MSC_VER) && CONFIG_SHARED -# define av_export __declspec(dllimport) +#ifdef BUILDING_avutil +# define av_export_avutil __declspec(dllexport) #else -# define av_export +# define av_export_avutil __declspec(dllimport) +#endif +#else +# define av_export_avutil #endif #if HAVE_PRAGMA_DEPRECATED diff --git a/libavutil/xga_font_data.h b/libavutil/xga_font_data.h index 5e40f542e4..69dc337120 100644 --- a/libavutil/xga_font_data.h +++ b/libavutil/xga_font_data.h @@ -29,7 +29,7 @@ #include <stdint.h> #include "internal.h" -extern av_export const uint8_t avpriv_cga_font[2048]; -extern av_export const uint8_t avpriv_vga16_font[4096]; +extern av_export_avutil const uint8_t avpriv_cga_font[2048]; +extern av_export_avutil const uint8_t avpriv_vga16_font[4096]; #endif /* AVUTIL_XGA_FONT_DATA_H */ |