diff options
| author | Daiki Ueno <ueno@gnu.org> | 2013-02-25 18:18:24 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2013-02-25 18:19:03 +0900 |
| commit | 87a885f02321682e9e6bf63346c8796c6666f2d1 (patch) | |
| tree | ee405009f4aee4c5fad6e7bb1d791be13ff99ab4 /gettext-runtime/intl | |
| parent | ac6f7dcf4c8225474b3e851e62428e151e947448 (diff) | |
| download | external_gettext-87a885f02321682e9e6bf63346c8796c6666f2d1.zip external_gettext-87a885f02321682e9e6bf63346c8796c6666f2d1.tar.gz external_gettext-87a885f02321682e9e6bf63346c8796c6666f2d1.tar.bz2 | |
Determine Woe32 C symbol prefix at configure time.
Diffstat (limited to 'gettext-runtime/intl')
| -rw-r--r-- | gettext-runtime/intl/ChangeLog | 7 | ||||
| -rw-r--r-- | gettext-runtime/intl/intl-exports.c | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index c3786a7..8368bec 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,10 @@ +2013-02-25 Daiki Ueno <ueno@gnu.org> + + Determine imported C symbol prefix at configure time. + Suggested by Evgeny Grin in <http://savannah.gnu.org/bugs/?29946>. + * intl-exports.c (IMP): Define depending on the result of the + configure run. + 2013-01-21 Daiki Ueno <ueno@gnu.org> Remove references to non-existing COPYING.LIB-2.*. diff --git a/gettext-runtime/intl/intl-exports.c b/gettext-runtime/intl/intl-exports.c index 4a5126b..891c25e 100644 --- a/gettext-runtime/intl/intl-exports.c +++ b/gettext-runtime/intl/intl-exports.c @@ -16,13 +16,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* IMP(x) is a symbol that contains the address of x. */ -#if defined _WIN64 && defined __MINGW32__ - /* mingw W64 started using __imp_ prefix for MSVC compatibility since - 2010. Ideally we should check the prefix in configure though, - we assume __imp_ on mingw W64 for the time being. */ -# define IMP(x) __imp_##x -#else +#if USER_LABEL_PREFIX_UNDERSCORE # define IMP(x) _imp__##x +#else +# define IMP(x) __imp_##x #endif /* Ensure that the variable x is exported from the library, and that a |