mirror/gettext
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gettext.git synced 2026-01-26 15:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix W64 build errors.

Browse Source
This commit is contained in:
Daiki Ueno 2012-12-21 17:39:02 +09:00
parent a1d4e87fe4
commit 17be61925e
7 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2012-12-21 Daiki Ueno <ueno@gnu.org>
Fix W64 build errors.
* autogen.sh (GNULIB_MODULES_LIBASPRINTF): Add extern-inline, for
the last xsize.h update.
(GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES): Add locale,
not to have copies of locale.h in both libgrep and gnulib-lib.
(GNULIB_MODULES_LIBGETTEXTPO): Add close.
2012-12-08 Daiki Ueno <ueno@unixuser.org>
* autogen.sh: Ignore libunistring tests which are known to fail.

3
autogen.sh
View File

@ -109,6 +109,7 @@ if ! $skip_gnulib; then
alloca
errno
verify
extern-inline
'
GNULIB_MODULES_LIBASPRINTF_OTHER='
'
@ -221,6 +222,7 @@ if ! $skip_gnulib; then
extensions
gettext-h
include_next
locale
localcharset
malloc-posix
mbrtowc
@ -271,6 +273,7 @@ if ! $skip_gnulib; then
# This is a subset of the GNULIB_MODULES_FOR_SRC.
GNULIB_MODULES_LIBGETTEXTPO='
basename
close
c-ctype
c-strcase
c-strstr

7
gettext-runtime/intl/ChangeLog
View File

@ -1,3 +1,10 @@
2012-12-21 Daiki Ueno <ueno@gnu.org>
Fix W64 build errors.
* intl-exports.c (IMP) [_WIN64]: Prefix "__imp_" instead of
"_imp__".
* osdep.c: Include intl-exports.c on mingw as well as Cygwin.
2012-12-10 Daiki Ueno <ueno@unixuser.org>
* intl-compat.c: Fix typo in the copyright header.

9
gettext-runtime/intl/intl-exports.c
View File

@ -16,7 +16,14 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* IMP(x) is a symbol that contains the address of x. */
#define IMP(x) _imp__##x
#if _WIN64
/* mingw W64 changed the symbol prefix from W32 for MSVC
compatibility. See the comments in
mingw-w64-headers/crt/_mingw_mac.h for more details. */
# 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
pseudo-variable IMP(x) is available. */

2
gettext-runtime/intl/osdep.c
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#if defined __CYGWIN__
#if defined __CYGWIN__ || defined __MINGW32__
# include "intl-exports.c"
#elif defined __EMX__
# include "os2compat.c"

6
gettext-tools/ChangeLog
View File

@ -1,3 +1,9 @@
2012-12-21 Daiki Ueno <ueno@gnu.org>
Fix W64 build errors.
* woe32dll/export.h (IMP) [_WIN64]: Prefix "__imp_" instead of
"_imp__".
2012-12-17 Daiki Ueno <ueno@unixuser.org>
* configure.ac: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER.

7
gettext-tools/woe32dll/export.h
View File

@ -94,7 +94,14 @@
#if defined __GNUC__ /* GCC compiler, GNU toolchain */
/* IMP(x) is a symbol that contains the address of x. */
#if _WIN64
/* mingw W64 changed the symbol prefix from W32 for MSVC
compatibility. See the comments in
mingw-w64-headers/crt/_mingw_mac.h for more details. */
# 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
pseudo-variable IMP(x) is available. */