[gettext.win32] Updated to gettext-0.22.

Compiled using gcc-13.2.0 and MinGW-w64 11.0.0.

Removed the *.dll.debug files, since I'm not planning on debugging
gettext, and no one seems to care about them anyway.

NOTE: The libgnuintl-8.dll files are more than double the size of
the previous version. This might be due to using a newly-built
Gentoo crossdev MinGW-w64 toolchain on my laptop instead of the
old MinGW-w64 toolchain on Ubuntu 22.04, or it might be because
gettext-0.22 has more wchar_t functionality on Windows now.

TODO: Build for Windows on ARM using LLVM MinGW-w64.
This commit is contained in:
David Korth 2023-07-28 19:37:18 -04:00
parent b4b2c2bd04
commit a9a454d912
45 changed files with 422 additions and 288 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,5 +1,5 @@
/* Message catalogs for internationalization.
Copyright (C) 1995-1997, 2000-2016, 2018-2020 Free Software Foundation, Inc.
Copyright (C) 1995-1997, 2000-2016, 2018-2023 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
@ -19,8 +19,10 @@
#if 1 && BUILDING_LIBINTL
#define LIBINTL_DLL_EXPORTED __attribute__((__visibility__("default")))
#elif defined _MSC_VER && BUILDING_LIBINTL
#elif (defined _WIN32 && !defined __CYGWIN__) && defined WOE32DLL && BUILDING_LIBINTL
#define LIBINTL_DLL_EXPORTED __declspec(dllexport)
#elif (defined _WIN32 && !defined __CYGWIN__) && defined WOE32DLL
#define LIBINTL_DLL_EXPORTED __declspec(dllimport)
#else
#define LIBINTL_DLL_EXPORTED
#endif
@ -62,7 +64,7 @@ extern "C" {
/* Version number: (major<<16) + (minor<<8) + subminor */
#define LIBINTL_VERSION 0x001500
#define LIBINTL_VERSION 0x001600
extern LIBINTL_DLL_EXPORTED __declspec (dllimport) int libintl_version;
@ -129,7 +131,7 @@ extern LIBINTL_DLL_EXPORTED __declspec (dllimport) int libintl_version;
LC_MESSAGES locale. If not found, returns MSGID itself (the default
text). */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char * libintl_gettext (const char *__msgid)
extern LIBINTL_DLL_EXPORTED char *libintl_gettext (const char *__msgid)
_INTL_MAY_RETURN_STRING_ARG (1);
static inline
_INTL_MAY_RETURN_STRING_ARG (1)
@ -138,10 +140,10 @@ char *gettext (const char *__msgid)
return libintl_gettext (__msgid);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define gettext libintl_gettext
#endif
extern LIBINTL_DLL_EXPORTED char * gettext (const char *__msgid)
# ifdef _INTL_REDIRECT_MACROS
# define gettext libintl_gettext
# endif
extern LIBINTL_DLL_EXPORTED char *gettext (const char *__msgid)
_INTL_ASM (libintl_gettext)
_INTL_MAY_RETURN_STRING_ARG (1);
#endif
@ -149,7 +151,7 @@ extern LIBINTL_DLL_EXPORTED char * gettext (const char *__msgid)
/* Look up MSGID in the DOMAINNAME message catalog for the current
LC_MESSAGES locale. */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char * libintl_dgettext (const char *__domainname, const char *__msgid)
extern LIBINTL_DLL_EXPORTED char *libintl_dgettext (const char *__domainname, const char *__msgid)
_INTL_MAY_RETURN_STRING_ARG (2);
static inline
_INTL_MAY_RETURN_STRING_ARG (2)
@ -158,10 +160,10 @@ char *dgettext (const char *__domainname, const char *__msgid)
return libintl_dgettext (__domainname, __msgid);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define dgettext libintl_dgettext
#endif
extern LIBINTL_DLL_EXPORTED char * dgettext (const char *__domainname, const char *__msgid)
# ifdef _INTL_REDIRECT_MACROS
# define dgettext libintl_dgettext
# endif
extern LIBINTL_DLL_EXPORTED char *dgettext (const char *__domainname, const char *__msgid)
_INTL_ASM (libintl_dgettext)
_INTL_MAY_RETURN_STRING_ARG (2);
#endif
@ -169,7 +171,7 @@ extern LIBINTL_DLL_EXPORTED char * dgettext (const char *__domainname, const cha
/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
locale. */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char * libintl_dcgettext (const char *__domainname, const char *__msgid,
extern LIBINTL_DLL_EXPORTED char *libintl_dcgettext (const char *__domainname, const char *__msgid,
int __category)
_INTL_MAY_RETURN_STRING_ARG (2);
static inline
@ -179,10 +181,10 @@ char *dcgettext (const char *__domainname, const char *__msgid, int __category)
return libintl_dcgettext (__domainname, __msgid, __category);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define dcgettext libintl_dcgettext
#endif
extern LIBINTL_DLL_EXPORTED char * dcgettext (const char *__domainname, const char *__msgid,
# ifdef _INTL_REDIRECT_MACROS
# define dcgettext libintl_dcgettext
# endif
extern LIBINTL_DLL_EXPORTED char *dcgettext (const char *__domainname, const char *__msgid,
int __category)
_INTL_ASM (libintl_dcgettext)
_INTL_MAY_RETURN_STRING_ARG (2);
@ -192,7 +194,7 @@ extern LIBINTL_DLL_EXPORTED char * dcgettext (const char *__domainname, const ch
/* Similar to 'gettext' but select the plural form corresponding to the
number N. */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char * libintl_ngettext (const char *__msgid1, const char *__msgid2,
extern LIBINTL_DLL_EXPORTED char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
unsigned long int __n)
_INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
static inline
@ -203,10 +205,10 @@ char *ngettext (const char *__msgid1, const char *__msgid2,
return libintl_ngettext (__msgid1, __msgid2, __n);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define ngettext libintl_ngettext
#endif
extern LIBINTL_DLL_EXPORTED char * ngettext (const char *__msgid1, const char *__msgid2,
# ifdef _INTL_REDIRECT_MACROS
# define ngettext libintl_ngettext
# endif
extern LIBINTL_DLL_EXPORTED char *ngettext (const char *__msgid1, const char *__msgid2,
unsigned long int __n)
_INTL_ASM (libintl_ngettext)
_INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
@ -215,7 +217,7 @@ extern LIBINTL_DLL_EXPORTED char * ngettext (const char *__msgid1, const char *_
/* Similar to 'dgettext' but select the plural form corresponding to the
number N. */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char * libintl_dngettext (const char *__domainname, const char *__msgid1,
extern LIBINTL_DLL_EXPORTED char *libintl_dngettext (const char *__domainname, const char *__msgid1,
const char *__msgid2, unsigned long int __n)
_INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
static inline
@ -226,10 +228,10 @@ char *dngettext (const char *__domainname, const char *__msgid1,
return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define dngettext libintl_dngettext
#endif
extern LIBINTL_DLL_EXPORTED char * dngettext (const char *__domainname,
# ifdef _INTL_REDIRECT_MACROS
# define dngettext libintl_dngettext
# endif
extern LIBINTL_DLL_EXPORTED char *dngettext (const char *__domainname,
const char *__msgid1, const char *__msgid2,
unsigned long int __n)
_INTL_ASM (libintl_dngettext)
@ -239,7 +241,7 @@ extern LIBINTL_DLL_EXPORTED char * dngettext (const char *__domainname,
/* Similar to 'dcgettext' but select the plural form corresponding to the
number N. */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char * libintl_dcngettext (const char *__domainname,
extern LIBINTL_DLL_EXPORTED char *libintl_dcngettext (const char *__domainname,
const char *__msgid1, const char *__msgid2,
unsigned long int __n, int __category)
_INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
@ -252,10 +254,10 @@ char *dcngettext (const char *__domainname,
return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define dcngettext libintl_dcngettext
#endif
extern LIBINTL_DLL_EXPORTED char * dcngettext (const char *__domainname,
# ifdef _INTL_REDIRECT_MACROS
# define dcngettext libintl_dcngettext
# endif
extern LIBINTL_DLL_EXPORTED char *dcngettext (const char *__domainname,
const char *__msgid1, const char *__msgid2,
unsigned long int __n, int __category)
_INTL_ASM (libintl_dcngettext)
@ -267,77 +269,77 @@ extern LIBINTL_DLL_EXPORTED char * dcngettext (const char *__domainname,
/* Set the current default message catalog to DOMAINNAME.
If DOMAINNAME is null, return the current default.
If DOMAINNAME is "", reset to the default of "messages". */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char * libintl_textdomain (const char *__domainname);
# ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char *libintl_textdomain (const char *__domainname);
static inline char *textdomain (const char *__domainname)
{
return libintl_textdomain (__domainname);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define textdomain libintl_textdomain
#endif
extern LIBINTL_DLL_EXPORTED char * textdomain (const char *__domainname)
# else
# ifdef _INTL_REDIRECT_MACROS
# define textdomain libintl_textdomain
# endif
extern LIBINTL_DLL_EXPORTED char *textdomain (const char *__domainname)
_INTL_ASM (libintl_textdomain);
#endif
# endif
/* Specify that the DOMAINNAME message catalog will be found
in DIRNAME rather than in the system locale data base. */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char * libintl_bindtextdomain (const char *__domainname,
# ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char *libintl_bindtextdomain (const char *__domainname,
const char *__dirname);
static inline char *bindtextdomain (const char *__domainname,
const char *__dirname)
{
return libintl_bindtextdomain (__domainname, __dirname);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define bindtextdomain libintl_bindtextdomain
#endif
extern LIBINTL_DLL_EXPORTED char * bindtextdomain (const char *__domainname, const char *__dirname)
# else
# ifdef _INTL_REDIRECT_MACROS
# define bindtextdomain libintl_bindtextdomain
# endif
extern LIBINTL_DLL_EXPORTED char *bindtextdomain (const char *__domainname, const char *__dirname)
_INTL_ASM (libintl_bindtextdomain);
#endif
# endif
#if defined _WIN32 && !defined __CYGWIN__
# if defined _WIN32 && !defined __CYGWIN__
/* Specify that the DOMAINNAME message catalog will be found
in WDIRNAME rather than in the system locale data base. */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED wchar_t * libintl_wbindtextdomain (const char *__domainname,
# ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED wchar_t *libintl_wbindtextdomain (const char *__domainname,
const wchar_t *__wdirname);
static inline wchar_t *wbindtextdomain (const char *__domainname,
const wchar_t *__wdirname)
{
return libintl_wbindtextdomain (__domainname, __wdirname);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define wbindtextdomain libintl_wbindtextdomain
#endif
extern LIBINTL_DLL_EXPORTED wchar_t * wbindtextdomain (const char *__domainname,
# else
# ifdef _INTL_REDIRECT_MACROS
# define wbindtextdomain libintl_wbindtextdomain
# endif
extern LIBINTL_DLL_EXPORTED wchar_t *wbindtextdomain (const char *__domainname,
const wchar_t *__wdirname)
_INTL_ASM (libintl_wbindtextdomain);
#endif
#endif
# endif
# endif
/* Specify the character encoding in which the messages from the
DOMAINNAME message catalog will be returned. */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char * libintl_bind_textdomain_codeset (const char *__domainname,
# ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char *libintl_bind_textdomain_codeset (const char *__domainname,
const char *__codeset);
static inline char *bind_textdomain_codeset (const char *__domainname,
const char *__codeset)
{
return libintl_bind_textdomain_codeset (__domainname, __codeset);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define bind_textdomain_codeset libintl_bind_textdomain_codeset
#endif
extern LIBINTL_DLL_EXPORTED char * bind_textdomain_codeset (const char *__domainname,
# else
# ifdef _INTL_REDIRECT_MACROS
# define bind_textdomain_codeset libintl_bind_textdomain_codeset
# endif
extern LIBINTL_DLL_EXPORTED char *bind_textdomain_codeset (const char *__domainname,
const char *__codeset)
_INTL_ASM (libintl_bind_textdomain_codeset);
#endif
# endif
@ -349,32 +351,49 @@ extern LIBINTL_DLL_EXPORTED char * bind_textdomain_codeset (const char *__domain
or gettext() but for which the format string could be the return value
of _() or gettext() need to add this #include. Oh well. */
/* Note: In C++ mode, it is not sufficient to redefine a symbol at the
preprocessor macro level, such as
#define sprintf libintl_sprintf
Some programs may reference std::sprintf after including <libintl.h>.
Therefore we must make sure that std::libintl_sprintf is defined and
identical to ::libintl_sprintf.
The user can define _INTL_CXX_NO_CLOBBER_STD_NAMESPACE to avoid this.
In such cases, they will not benefit from the overrides when using
the 'std' namespace, and they will need to do the references to the
'std' namespace *before* including <libintl.h> or "gettext.h". */
#if !0
#include <stdio.h>
#include <stddef.h>
# include <stdio.h>
# include <stddef.h>
/* Get va_list. */
#if (defined __STDC__ && __STDC__) || defined __cplusplus || defined _MSC_VER
# include <stdarg.h>
#else
# include <varargs.h>
#endif
# if (defined __STDC__ && __STDC__) || defined __cplusplus || defined _MSC_VER
# include <stdarg.h>
# else
# include <varargs.h>
# endif
#if !(defined fprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef fprintf
#define fprintf libintl_fprintf
# if !((defined fprintf && defined _GL_STDIO_H) || defined GNULIB_overrides_fprintf) /* don't override gnulib */
# undef fprintf
# define fprintf libintl_fprintf
extern LIBINTL_DLL_EXPORTED int fprintf (FILE *, const char *, ...);
#endif
#if !(defined vfprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef vfprintf
#define vfprintf libintl_vfprintf
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_fprintf; }
# endif
# endif
# if !((defined vfprintf && defined _GL_STDIO_H) || defined GNULIB_overrides_vfprintf) /* don't override gnulib */
# undef vfprintf
# define vfprintf libintl_vfprintf
extern LIBINTL_DLL_EXPORTED int vfprintf (FILE *, const char *, va_list);
#endif
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_vfprintf; }
# endif
# endif
#if !(defined printf && defined _GL_STDIO_H) /* don't override gnulib */
#undef printf
#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__ || defined _MSC_VER
# if !((defined printf && defined _GL_STDIO_H) || defined GNULIB_overrides_printf) /* don't override gnulib */
# undef printf
# if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__ || defined _MSC_VER
/* Don't break __attribute__((format(printf,M,N))).
This redefinition is only possible because the libc in NetBSD, Cygwin,
mingw does not have a function __printf__.
@ -384,82 +403,124 @@ extern LIBINTL_DLL_EXPORTED int vfprintf (FILE *, const char *, va_list);
__asm__ (#__USER_LABEL_PREFIX__ "libintl_printf");
But doing it now would introduce a binary incompatibility with already
distributed versions of libintl on these systems. */
# define libintl_printf __printf__
#endif
#define printf libintl_printf
# define libintl_printf __printf__
# endif
# define printf libintl_printf
extern LIBINTL_DLL_EXPORTED int printf (const char *, ...);
#endif
#if !(defined vprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef vprintf
#define vprintf libintl_vprintf
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_printf; }
# endif
# endif
# if !((defined vprintf && defined _GL_STDIO_H) || defined GNULIB_overrides_vprintf) /* don't override gnulib */
# undef vprintf
# define vprintf libintl_vprintf
extern LIBINTL_DLL_EXPORTED int vprintf (const char *, va_list);
#endif
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_vprintf; }
# endif
# endif
#if !(defined sprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef sprintf
#define sprintf libintl_sprintf
# if !((defined sprintf && defined _GL_STDIO_H) || defined GNULIB_overrides_sprintf) /* don't override gnulib */
# undef sprintf
# define sprintf libintl_sprintf
extern LIBINTL_DLL_EXPORTED int sprintf (char *, const char *, ...);
#endif
#if !(defined vsprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef vsprintf
#define vsprintf libintl_vsprintf
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_sprintf; }
# endif
# endif
# if !((defined vsprintf && defined _GL_STDIO_H) || defined GNULIB_overrides_vsprintf) /* don't override gnulib */
# undef vsprintf
# define vsprintf libintl_vsprintf
extern LIBINTL_DLL_EXPORTED int vsprintf (char *, const char *, va_list);
#endif
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_vsprintf; }
# endif
# endif
#if 1
# if 1
#if !(defined snprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef snprintf
#define snprintf libintl_snprintf
# if !((defined snprintf && defined _GL_STDIO_H) || defined GNULIB_overrides_snprintf) /* don't override gnulib */
# undef snprintf
# define snprintf libintl_snprintf
extern LIBINTL_DLL_EXPORTED int snprintf (char *, size_t, const char *, ...);
#endif
#if !(defined vsnprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef vsnprintf
#define vsnprintf libintl_vsnprintf
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_snprintf; }
# endif
# endif
# if !((defined vsnprintf && defined _GL_STDIO_H) || defined GNULIB_overrides_vsnprintf) /* don't override gnulib */
# undef vsnprintf
# define vsnprintf libintl_vsnprintf
extern LIBINTL_DLL_EXPORTED int vsnprintf (char *, size_t, const char *, va_list);
#endif
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_vsnprintf; }
# endif
# endif
#endif
# endif
#if 1
# if 1
#if !(defined asprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef asprintf
#define asprintf libintl_asprintf
# if !((defined asprintf && defined _GL_STDIO_H) || defined GNULIB_overrides_asprintf) /* don't override gnulib */
# undef asprintf
# define asprintf libintl_asprintf
extern LIBINTL_DLL_EXPORTED int asprintf (char **, const char *, ...);
#endif
#if !(defined vasprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef vasprintf
#define vasprintf libintl_vasprintf
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_asprintf; }
# endif
# endif
# if !((defined vasprintf && defined _GL_STDIO_H) || defined GNULIB_overrides_vasprintf) /* don't override gnulib */
# undef vasprintf
# define vasprintf libintl_vasprintf
extern LIBINTL_DLL_EXPORTED int vasprintf (char **, const char *, va_list);
#endif
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_vasprintf; }
# endif
# endif
#endif
# endif
#if 1
# if 1
#undef fwprintf
#define fwprintf libintl_fwprintf
# undef fwprintf
# define fwprintf libintl_fwprintf
extern LIBINTL_DLL_EXPORTED int fwprintf (FILE *, const wchar_t *, ...);
#undef vfwprintf
#define vfwprintf libintl_vfwprintf
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_fwprintf; }
# endif
# undef vfwprintf
# define vfwprintf libintl_vfwprintf
extern LIBINTL_DLL_EXPORTED int vfwprintf (FILE *, const wchar_t *, va_list);
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_vfwprintf; }
# endif
#undef wprintf
#define wprintf libintl_wprintf
# undef wprintf
# define wprintf libintl_wprintf
extern LIBINTL_DLL_EXPORTED int wprintf (const wchar_t *, ...);
#undef vwprintf
#define vwprintf libintl_vwprintf
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_wprintf; }
# endif
# undef vwprintf
# define vwprintf libintl_vwprintf
extern LIBINTL_DLL_EXPORTED int vwprintf (const wchar_t *, va_list);
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_vwprintf; }
# endif
#undef swprintf
#define swprintf libintl_swprintf
# undef swprintf
# define swprintf libintl_swprintf
extern LIBINTL_DLL_EXPORTED int swprintf (wchar_t *, size_t, const wchar_t *, ...);
#undef vswprintf
#define vswprintf libintl_vswprintf
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_swprintf; }
# endif
# undef vswprintf
# define vswprintf libintl_vswprintf
extern LIBINTL_DLL_EXPORTED int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_vswprintf; }
# endif
#endif
# endif
#endif
@ -467,23 +528,32 @@ extern LIBINTL_DLL_EXPORTED int vswprintf (wchar_t *, size_t, const wchar_t *, v
/* Support for retrieving the name of a locale_t object. */
#if 0
#ifndef GNULIB_defined_newlocale /* don't override gnulib */
#undef newlocale
#define newlocale libintl_newlocale
# ifndef GNULIB_defined_newlocale /* don't override gnulib */
# undef newlocale
# define newlocale libintl_newlocale
extern LIBINTL_DLL_EXPORTED locale_t newlocale (int, const char *, locale_t);
#endif
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_newlocale; }
# endif
# endif
#ifndef GNULIB_defined_duplocale /* don't override gnulib */
#undef duplocale
#define duplocale libintl_duplocale
# ifndef GNULIB_defined_duplocale /* don't override gnulib */
# undef duplocale
# define duplocale libintl_duplocale
extern LIBINTL_DLL_EXPORTED locale_t duplocale (locale_t);
#endif
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_duplocale; }
# endif
# endif
#ifndef GNULIB_defined_freelocale /* don't override gnulib */
#undef freelocale
#define freelocale libintl_freelocale
# ifndef GNULIB_defined_freelocale /* don't override gnulib */
# undef freelocale
# define freelocale libintl_freelocale
extern LIBINTL_DLL_EXPORTED void freelocale (locale_t);
#endif
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_freelocale; }
# endif
# endif
#endif
@ -491,22 +561,28 @@ extern LIBINTL_DLL_EXPORTED void freelocale (locale_t);
/* Support for the locale chosen by the user. */
#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __CYGWIN__
#ifndef GNULIB_defined_setlocale /* don't override gnulib */
#undef setlocale
#define setlocale libintl_setlocale
extern LIBINTL_DLL_EXPORTED char * setlocale (int, const char *);
#endif
# ifndef GNULIB_defined_setlocale /* don't override gnulib */
# undef setlocale
# define setlocale libintl_setlocale
extern LIBINTL_DLL_EXPORTED char *setlocale (int, const char *);
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_setlocale; }
# endif
# endif
#if 0
# if 0
#undef newlocale
#define newlocale libintl_newlocale
# undef newlocale
# define newlocale libintl_newlocale
/* Declare newlocale() only if the system headers define the 'locale_t' type. */
#if !(defined __CYGWIN__ && !defined LC_ALL_MASK)
# if !(defined __CYGWIN__ && !defined LC_ALL_MASK)
extern LIBINTL_DLL_EXPORTED locale_t newlocale (int, const char *, locale_t);
#endif
# if defined __cplusplus && !defined _INTL_CXX_NO_CLOBBER_STD_NAMESPACE
namespace std { using ::libintl_newlocale; }
# endif
# endif
#endif
# endif
#endif

View File

@ -1,28 +1,9 @@
EXPORTS
DllMain
__imp_gl_get_setlocale_null_lock DATA
__imp_libintl_version DATA
__printf__
_nl_expand_alias
_nl_explode_name
_nl_find_domain
_nl_find_msg
_nl_language_preferences_default
_nl_load_domain
_nl_locale_name
_nl_locale_name_canonicalize
_nl_locale_name_default
_nl_locale_name_environ
_nl_locale_name_from_win32_LANGID
_nl_locale_name_from_win32_LCID
_nl_locale_name_posix
_nl_locale_name_thread
_nl_locale_name_thread_unsafe
_nl_log_untranslated
_nl_make_l10nflist
_nl_msg_cat_cntr DATA
_nl_normalize_codeset
_nl_state_lock DATA
bind_textdomain_codeset
bindtextdomain
dcgettext
@ -30,7 +11,6 @@ EXPORTS
dgettext
dngettext
gettext
gl_get_setlocale_null_lock
libintl_asprintf
libintl_bind_textdomain_codeset
libintl_bindtextdomain
@ -40,38 +20,31 @@ EXPORTS
libintl_dgettext
libintl_dngettext
libintl_fprintf
libintl_fwprintf
libintl_gettext
libintl_gettext_extract_plural
libintl_gettext_free_exp
libintl_gettext_germanic_plural DATA
libintl_gettextparse
libintl_hash_string
libintl_ngettext
libintl_nl_current_default_domain DATA
libintl_nl_default_default_domain DATA
libintl_nl_default_dirname DATA
libintl_nl_domain_bindings DATA
libintl_relocate
libintl_relocate2
libintl_set_relocation_prefix
libintl_setlocale
libintl_snprintf
libintl_sprintf
libintl_swprintf
libintl_textdomain
libintl_vasnprintf
libintl_vasprintf
libintl_version DATA
libintl_vfprintf
libintl_vfwprintf
libintl_vprintf
libintl_vsnprintf
libintl_vsprintf
libintl_vswprintf
libintl_vwprintf
libintl_wbindtextdomain
libintl_wprintf
locale_charset
ngettext
setlocale_null
setlocale_null_r
textdomain
xmax
xsum
xsum3
xsum4

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,27 +1,8 @@
EXPORTS
__imp_libintl_version DATA
__printf__
_imp__gl_get_setlocale_null_lock DATA
_imp__libintl_version DATA
_nl_expand_alias
_nl_explode_name
_nl_find_domain
_nl_find_msg
_nl_language_preferences_default
_nl_load_domain
_nl_locale_name
_nl_locale_name_canonicalize
_nl_locale_name_default
_nl_locale_name_environ
_nl_locale_name_from_win32_LANGID
_nl_locale_name_from_win32_LCID
_nl_locale_name_posix
_nl_locale_name_thread
_nl_locale_name_thread_unsafe
_nl_log_untranslated
_nl_make_l10nflist
_nl_msg_cat_cntr DATA
_nl_normalize_codeset
_nl_state_lock DATA
bind_textdomain_codeset
bindtextdomain
dcgettext
@ -29,7 +10,6 @@ EXPORTS
dgettext
dngettext
gettext
gl_get_setlocale_null_lock
libintl_asprintf
libintl_bind_textdomain_codeset
libintl_bindtextdomain
@ -39,38 +19,31 @@ EXPORTS
libintl_dgettext
libintl_dngettext
libintl_fprintf
libintl_fwprintf
libintl_gettext
libintl_gettext_extract_plural
libintl_gettext_free_exp
libintl_gettext_germanic_plural DATA
libintl_gettextparse
libintl_hash_string
libintl_ngettext
libintl_nl_current_default_domain DATA
libintl_nl_default_default_domain DATA
libintl_nl_default_dirname DATA
libintl_nl_domain_bindings DATA
libintl_relocate
libintl_relocate2
libintl_set_relocation_prefix
libintl_setlocale
libintl_snprintf
libintl_sprintf
libintl_swprintf
libintl_textdomain
libintl_vasnprintf
libintl_vasprintf
libintl_version DATA
libintl_vfprintf
libintl_vfwprintf
libintl_vprintf
libintl_vsnprintf
libintl_vsprintf
libintl_vswprintf
libintl_vwprintf
libintl_wbindtextdomain
libintl_wprintf
locale_charset
ngettext
setlocale_null
setlocale_null_r
textdomain
xmax
xsum
xsum3
xsum4

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,17 @@
From: Michele Locati <michele@locati.it>
Date: Fri, 10 May 2019 11:11:02 +0200
Subject: [PATCH] Fix compilation of pthread_sigmask.c
--- a/gettext-tools/gnulib-tests/pthread_sigmask.c
+++ b/gettext-tools/gnulib-tests/pthread_sigmask.c
@@ -30,9 +30,9 @@
# include <unistd.h>
#endif
+#undef pthread_sigmask
int
pthread_sigmask (int how, const sigset_t *new_mask, sigset_t *old_mask)
-#undef pthread_sigmask
{
#if HAVE_PTHREAD_SIGMASK
int ret;

View File

@ -1,16 +1,16 @@
--- gettext-tools/gnulib-lib/libxml/parser.c.orig 2013-01-18 10:24:37 +0400
+++ gettext-tools/gnulib-lib/libxml/parser.c 2013-01-18 10:36:35 +0400
@@ -42,6 +42,9 @@
#include <stdlib.h>
@@ -78,6 +78,9 @@
#include <string.h>
#include <stdarg.h>
#include <stddef.h>
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
+#endif
#include <libxml/xmlmemory.h>
#include <libxml/threads.h>
#include <libxml/globals.h>
@@ -61,9 +64,6 @@
@@ -97,9 +100,6 @@
#include <libxml/xmlschemastypes.h>
#include <libxml/relaxng.h>
#endif
@ -22,7 +22,7 @@
#endif
--- gettext-tools/gnulib-lib/libxml/threads.c.orig 2013-01-18 10:38:24 +0400
+++ gettext-tools/gnulib-lib/libxml/threads.c 2013-01-18 10:41:11 +0400
@@ -12,15 +12,16 @@
@@ -41,15 +41,16 @@
#include <string.h>

View File

@ -1,6 +1,6 @@
--- gettext-runtime/libasprintf/vasnprintf.h.orig 2013-01-17 09:09:12 +0400
+++ gettext-runtime/libasprintf/vasnprintf.h 2013-05-01 17:33:31 +0400
@@ -40,6 +40,8 @@
--- gettext-runtime/libasprintf/gnulib-lib/vasnprintf.h.orig 2023-05-19 00:19:37.000000000 -0400
+++ gettext-runtime/libasprintf/gnulib-lib/vasnprintf.h 2023-07-01 12:17:08.374266671 -0400
@@ -35,6 +35,8 @@
extern "C" {
#endif
@ -9,23 +9,53 @@
/* Write formatted output to a string dynamically allocated with malloc().
You can pass a preallocated buffer for the result in RESULTBUF and its
size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
@@ -64,11 +66,14 @@
free (output);
}
*/
@@ -63,6 +65,7 @@
# define asnprintf rpl_asnprintf
# define vasnprintf rpl_vasnprintf
#endif
+
extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
__attribute__ ((__format__ (__printf__, 3, 4)));
extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
__attribute__ ((__format__ (__printf__, 3, 0)));
extern char * asnprintf (char *restrict resultbuf, size_t *lengthp,
const char *format, ...)
_GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 3, 4));
@@ -70,6 +73,8 @@
const char *format, va_list args)
_GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 3, 0));
+#endif /* !defined(__USE_MINGW_ANSI_STDIO) && defined(__MINGW64_VERSION_MAJOR) */
+
#ifdef __cplusplus
}
#endif
--- gettext-runtime/libasprintf/vasprintf.h.orig 2013-04-30 09:03:19 +0400
+++ gettext-runtime/libasprintf/vasprintf.h 2013-05-01 17:32:04 +0400
--- gettext-runtime/intl/gnulib-lib/vasnprintf.h.orig 2023-05-19 00:19:37.000000000 -0400
+++ gettext-runtime/intl/gnulib-lib/vasnprintf.h 2023-07-01 12:17:08.374266671 -0400
@@ -35,6 +35,8 @@
extern "C" {
#endif
+#if !defined(__USE_MINGW_ANSI_STDIO) && defined(__MINGW64_VERSION_MAJOR)
+
/* Write formatted output to a string dynamically allocated with malloc().
You can pass a preallocated buffer for the result in RESULTBUF and its
size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
@@ -63,6 +65,7 @@
# define asnprintf rpl_asnprintf
# define vasnprintf rpl_vasnprintf
#endif
+
extern char * asnprintf (char *restrict resultbuf, size_t *lengthp,
const char *format, ...)
_GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 3, 4));
@@ -70,6 +73,8 @@
const char *format, va_list args)
_GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 3, 0));
+#endif /* !defined(__USE_MINGW_ANSI_STDIO) && defined(__MINGW64_VERSION_MAJOR) */
+
#ifdef __cplusplus
}
#endif
--- gettext-runtime/libasprintf/vasprintf.h.orig 2019-05-11 07:29:32.000000000 -0400
+++ gettext-runtime/libasprintf/vasprintf.h 2023-07-01 12:15:45.172287523 -0400
@@ -37,6 +37,8 @@
extern "C" {
#endif
@ -44,9 +74,9 @@
#ifdef __cplusplus
}
#endif
--- gettext-runtime/libasprintf/vasnprintf.c.orig 2013-05-01 18:07:02 +0400
+++ gettext-runtime/libasprintf/vasnprintf.c 2013-05-01 18:42:46 +0400
@@ -67,7 +67,14 @@
--- gettext-runtime/libasprintf/gnulib-lib/vasnprintf.c.orig 2023-06-12 13:34:50.000000000 -0400
+++ gettext-runtime/libasprintf/gnulib-lib/vasnprintf.c 2023-07-01 12:19:12.477235568 -0400
@@ -80,7 +80,14 @@
#endif
#include <locale.h> /* localeconv() */
@ -56,8 +86,25 @@
+#endif
#include <stdio.h> /* snprintf(), sprintf() */
+#if defined(__MINGW64_VERSION_MAJOR) && defined(REMOVED__USE_MINGW_ANSI_STDIO)
+# define __USE_MINGW_ANSI_STDIO
+# define __USE_MINGW_ANSI_STDIO 1
+#endif
#include <stdlib.h> /* abort(), malloc(), realloc(), free() */
#include <string.h> /* memcpy(), strlen() */
#include <errno.h> /* errno */
#include <wchar.h> /* mbstate_t, mbrtowc(), mbrlen(), wcrtomb() */
--- gettext-runtime/intl/gnulib-lib/vasnprintf.c.orig 2023-06-12 13:34:50.000000000 -0400
+++ gettext-runtime/intl/gnulib-lib/vasnprintf.c 2023-07-01 12:19:12.477235568 -0400
@@ -80,7 +80,14 @@
#endif
#include <locale.h> /* localeconv() */
+#if defined(__MINGW64_VERSION_MAJOR) && defined(__USE_MINGW_ANSI_STDIO)
+# define REMOVED__USE_MINGW_ANSI_STDIO
+# undef __USE_MINGW_ANSI_STDIO
+#endif
#include <stdio.h> /* snprintf(), sprintf() */
+#if defined(__MINGW64_VERSION_MAJOR) && defined(REMOVED__USE_MINGW_ANSI_STDIO)
+# define __USE_MINGW_ANSI_STDIO 1
+#endif
#include <stdlib.h> /* abort(), malloc(), realloc(), free() */
#include <string.h> /* memcpy(), strlen() */
#include <wchar.h> /* mbstate_t, mbrtowc(), mbrlen(), wcrtomb() */

View File

@ -1,11 +1,11 @@
--- gettext-runtime/intl/libgnuintl.in.h.old 2015-06-15 10:40:11.594942600 +0200
+++ gettext-runtime/intl/libgnuintl.in.h 2015-06-15 10:40:50.579345400 +0200
@@ -336,7 +336,7 @@ extern int vfprintf (FILE *, const char
--- gettext-runtime/intl/libgnuintl.in.h.orig 2023-06-17 06:58:50.000000000 -0400
+++ gettext-runtime/intl/libgnuintl.in.h 2023-07-01 12:21:22.071203089 -0400
@@ -385,7 +385,7 @@
#if !(defined printf && defined _GL_STDIO_H) /* don't override gnulib */
#undef printf
-#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
+#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__ || defined _MSC_VER
# if !((defined printf && defined _GL_STDIO_H) || defined GNULIB_overrides_printf) /* don't override gnulib */
# undef printf
-# if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
+# if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__ || defined _MSC_VER
/* Don't break __attribute__((format(printf,M,N))).
This redefinition is only possible because the libc in NetBSD, Cygwin,
mingw does not have a function __printf__.

View File

@ -1,26 +1,7 @@
diff -ur a/gettext-runtime/config.h.in b/gettext-runtime/config.h.in
--- gettext-0.19.8.1/gettext-runtime/config.h.in.orig 2016-06-11 09:00:54.000000000 -0400
+++ gettext-0.19.8.1/gettext-runtime/config.h.in 2018-04-08 18:56:06.658690128 -0400
@@ -350,10 +350,12 @@
#undef HAVE_GETUID
/* Define if you have the iconv() function and it works. */
-#undef HAVE_ICONV
+/* rom-properties: Disabled. */
+/* #undef HAVE_ICONV */
/* Define to 1 if you have the <iconv.h> header file. */
-#undef HAVE_ICONV_H
+/* rom-properties: Disabled. */
+/* #undef HAVE_ICONV_H */
/* Define to 1 if the compiler supports one of the keywords 'inline',
'__inline__', '__inline' and effectively inlines functions marked as such.
diff -ur a/gettext-tools/config.h.in b/gettext-tools/config.h.in
--- gettext-0.19.8.1/gettext-tools/config.h.in.orig 2016-06-11 09:01:08.000000000 -0400
+++ gettext-0.19.8.1/gettext-tools/config.h.in 2018-04-08 19:04:29.948733325 -0400
@@ -936,10 +936,12 @@
#undef HAVE_GETUID
--- gettext-0.22/gettext-tools/config.h.in.orig 2023-07-28 11:27:02.945221690 -0400
+++ gettext-0.22/gettext-tools/config.h.in 2023-07-28 11:28:23.103950976 -0400
@@ -1450,10 +1450,12 @@
#undef HAVE_GOOD_USELOCALE
/* Define if you have the iconv() function and it works. */
-#undef HAVE_ICONV
@ -34,3 +15,74 @@ diff -ur a/gettext-tools/config.h.in b/gettext-tools/config.h.in
/* Define to 1 if you have the `inet_ntop' function. */
#undef HAVE_INET_NTOP
@@ -2315,11 +2317,13 @@
#undef HAVE___XPG_STRERROR_R
/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
+/* rom-properties: Disabled. */
+/* #undef ICONV_CONST */
/* Define to a symbolic name denoting the flavor of iconv_open()
implementation. */
-#undef ICONV_FLAVOR
+/* rom-properties: Disabled. */
+/* #undef ICONV_FLAVOR */
/* Define to the value of ${prefix}, as a string. */
#undef INSTALLPREFIX
--- gettext-0.22/gettext-runtime/config.h.in.orig 2023-07-28 11:27:15.394179647 -0400
+++ gettext-0.22/gettext-runtime/config.h.in 2023-07-28 11:28:35.397909457 -0400
@@ -533,10 +533,12 @@
#undef HAVE_GOOD_USELOCALE
/* Define if you have the iconv() function and it works. */
-#undef HAVE_ICONV
+/* rom-properties: Disabled. */
+/* #undef HAVE_ICONV */
/* Define to 1 if you have the <iconv.h> header file. */
-#undef HAVE_ICONV_H
+/* rom-properties: Disabled. */
+/* #undef HAVE_ICONV_H */
/* Define to 1 if the compiler supports one of the keywords 'inline',
'__inline__', '__inline' and effectively inlines functions marked as such.
@@ -958,11 +960,13 @@
#undef HAVE___INLINE
/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
+/* rom-properties: Disabled. */
+/* #undef ICONV_CONST */
/* Define to a symbolic name denoting the flavor of iconv_open()
implementation. */
-#undef ICONV_FLAVOR
+/* rom-properties: Disabled. */
+/* #undef ICONV_FLAVOR */
/* Define to the value of ${prefix}, as a string. */
#undef INSTALLPREFIX
--- gettext-0.22/gettext-runtime/intl/config.h.in.orig 2023-06-17 07:53:52.000000000 -0400
+++ gettext-0.22/gettext-runtime/intl/config.h.in 2023-07-28 11:28:42.230886380 -0400
@@ -351,7 +351,8 @@
#undef HAVE_GOOD_USELOCALE
/* Define if you have the iconv() function and it works. */
-#undef HAVE_ICONV
+/* rom-properties: Disabled. */
+/* #undef HAVE_ICONV */
/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
#undef HAVE_INTMAX_T
@@ -715,7 +716,8 @@
#endif
/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
+/* rom-properties: Disabled. */
+/* #undef ICONV_CONST */
/* Define to the value of ${prefix}, as a string. */
#undef INSTALLPREFIX

View File

@ -11,12 +11,11 @@ And, change mode back to prior mode
gettext-runtime/src/envsubst.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/gettext-runtime/src/envsubst.c b/gettext-runtime/src/envsubst.c
index 941452b03..2afceb9ac 100644
--- a/gettext-runtime/src/envsubst.c
+++ b/gettext-runtime/src/envsubst.c
@@ -27,6 +27,11 @@
#include <string.h>
diff a/gettext-runtime/src/envsubst.c b/gettext-runtime/src/envsubst.c
--- a/gettext-runtime/src/envsubst.c.orig 2023-06-17 06:58:50.000000000 -0400
+++ b/gettext-runtime/src/envsubst.c 2023-07-01 12:25:40.029138440 -0400
@@ -28,6 +28,11 @@
#include <unistd.h>
#include <locale.h>
+#ifdef _WIN32
@ -24,10 +23,10 @@ index 941452b03..2afceb9ac 100644
+# include <fcntl.h>
+#endif
+
#include "noreturn.h"
#include "closeout.h"
#include "error.h"
#include "progname.h"
@@ -281,8 +286,21 @@ find_variables (const char *string,
@@ -289,8 +294,21 @@
static void
print_variable (const char *var_ptr, size_t var_len)
{
@ -49,6 +48,3 @@ index 941452b03..2afceb9ac 100644
}
/* Print the variables contained in STRING to stdout, each one followed by a
--
2.19.0.windows.1