diff options
| author | Bruno Haible <bruno@clisp.org> | 2020-11-21 22:37:30 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2022-10-09 09:30:42 +0200 |
| commit | 679b3552a60d189ec16ebc2cb9fedd09f2189fa4 (patch) | |
| tree | 7b6c67b49b8b03ba81d254c691b14414b2c16e8b /gettext-runtime | |
| parent | d0a72f056c714a2a55ec0f69a2a05d38b1fc70d9 (diff) | |
| download | gettext-679b3552a60d189ec16ebc2cb9fedd09f2189fa4.tar.gz | |
build: Remove the need for an autoconf test.
* gettext-runtime/intl/intl-exports.c (IMP): Use predefined preprocessor symbol
tests, not USER_LABEL_PREFIX_UNDERSCORE.
* gettext-runtime/configure.ac (INTL_EXPORTS_FLAGS): Remove variable.
* gnulib-local/modules/gettext-runtime-misc (Makefile.am): Don't use
INTL_EXPORTS_FLAGS.
* gettext-tools/woe32dll/export.h (IMP): Use predefined preprocessor symbol
tests, not USER_LABEL_PREFIX_UNDERSCORE.
* gettext-tools/configure.ac (GETTEXTLIB_EXPORTS_FLAGS): Don't define USER_LABEL_PREFIX_UNDERSCORE.
Diffstat (limited to 'gettext-runtime')
| -rw-r--r-- | gettext-runtime/configure.ac | 8 | ||||
| -rw-r--r-- | gettext-runtime/intl/intl-exports.c | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac index d524fc9c9..40187d145 100644 --- a/gettext-runtime/configure.ac +++ b/gettext-runtime/configure.ac @@ -130,14 +130,6 @@ if test $is_woe32dll = yes; then [Define when --enable-shared is used on mingw or Cygwin.]) fi -INTL_EXPORTS_FLAGS= -dnl 64-bit mingw does not prepend an underscore to C symbols. -dnl USER_LABEL_PREFIX is set by gl_ASM_SYMBOL_PREFIX, inside gl_INIT. -if test "$USER_LABEL_PREFIX" = _; then - INTL_EXPORTS_FLAGS="-DUSER_LABEL_PREFIX_UNDERSCORE $INTL_EXPORTS_FLAGS" -fi -AC_SUBST([INTL_EXPORTS_FLAGS]) - dnl Put some default definitions into config.h. AH_BOTTOM([ /* On Windows, variables that may be in a DLL must be marked specially. diff --git a/gettext-runtime/intl/intl-exports.c b/gettext-runtime/intl/intl-exports.c index 0ddfb89af..565426446 100644 --- a/gettext-runtime/intl/intl-exports.c +++ b/gettext-runtime/intl/intl-exports.c @@ -1,5 +1,5 @@ /* List of exported symbols of libintl on Cygwin. - Copyright (C) 2006, 2012-2013 Free Software Foundation, Inc. + Copyright (C) 2006, 2012-2020 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify @@ -16,10 +16,10 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* IMP(x) is a symbol that contains the address of x. */ -#if USER_LABEL_PREFIX_UNDERSCORE -# define IMP(x) _imp__##x -#else +#if defined _WIN64 || defined _LP64 # 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 |