Hi, everyone.
I build LibreOffice from source on Windows 11 (22H2) and it failed to build libgpg-error.
However, if the version of libgpg-error to be built is 1.44 or 1.45, the following error didn't occur and the build succeeded.
(In build.log)
---- begin compiler messages -------
***
*** Please note that your compiler does not support the GCC style
*** aligned attribute. Using this software may evoke bus errors.
***
Making all in m4
Making all in src
mkheader.c
mkerrcodes.c
./gpg-error.h.in:508: note: including './syscfg/lock-obj-pub.mingw32.h'
strsource-sym.c
strerror-sym.c
gpg-error.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c w32-gettext.c -o libgpg_error_la-w32-gettext.obj
w32-gettext.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c w32-lock.c -o libgpg_error_la-w32-lock.obj
w32-lock.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c w32-thread.c -o libgpg_error_la-w32-thread.obj
w32-thread.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c w32-iconv.c -o libgpg_error_la-w32-iconv.obj
w32-iconv.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c w32-estream.c -o libgpg_error_la-w32-estream.obj
w32-estream.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c w32-reg.c -o libgpg_error_la-w32-reg.obj
w32-reg.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c spawn-w32.c -o libgpg_error_la-spawn-w32.obj
spawn-w32.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c init.c -o libgpg_error_la-init.obj
init.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c version.c -o libgpg_error_la-version.obj
version.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c estream.c -o libgpg_error_la-estream.obj
estream.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c estream-printf.c -o libgpg_error_la-estream-printf.obj
estream-printf.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c strsource.c -o libgpg_error_la-strsource.obj
strsource.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c strerror.c -o libgpg_error_la-strerror.obj
strerror.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c code-to-errno.c -o libgpg_error_la-code-to-errno.obj
code-to-errno.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c code-from-errno.c -o libgpg_error_la-code-from-errno.obj
code-from-errno.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c visibility.c -o libgpg_error_la-visibility.obj
visibility.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c sysutils.c -o libgpg_error_la-sysutils.obj
sysutils.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c stringutils.c -o libgpg_error_la-stringutils.obj
stringutils.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c syscall-clamp.c -o libgpg_error_la-syscall-clamp.obj
syscall-clamp.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c logging.c -o libgpg_error_la-logging.obj
logging.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c b64dec.c -o libgpg_error_la-b64dec.obj
b64dec.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c b64enc.c -o libgpg_error_la-b64enc.obj
b64enc.c
libtool: compile: C:/sources/core/workdir/LinkTarget/Executable/gcc-wrapper.exe -DHAVE_CONFIG_H -I. -I.. -DLOCALEDIR=\"/usr/local/share/locale\" -g -c argparse.c -o libgpg_error_la-argparse.obj
argparse.c
Xlocale" -i versioninfo.rc -o versioninfo.lo
libtool: compile: warning: libobj name `locale" -i versioninfo.rc -o versioninfo.lo' may not contain shell special characters.
rm: unknown option -- o
Try 'rm --help' for more information.
libtool: compile: windres -O COFF --target=pe-x86-64 --preprocessor=C:/sources/core/workdir/LinkTarget/Executable/cpp.exe --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 "-IC:/PROGRA~2/WI3CF2~1/10/Include/10.0.22621.0/ucrt" "-IC:/PROGRA~2/WI3CF2~1/10/include" "-IC:/PROGRA~1/MICROS~3/2022/COMMUN~1/VC/Tools/MSVC/1436~1.325/Include" "-IC:/PROGRA~2/WI3CF2~1/10/Include/10.0.22621.0/um" "-IC:/PROGRA~2/WI3CF2~1/10/Include/10.0.22621.0/shared" "-IC:/PROGRA~1/Java/jdk-20/include/win32" "-IC:/PROGRA~1/Java/jdk-20/include" -DHAVE_CONFIG_H -I. -I.. "-DLOCALEDIR=\\/usr/local/share/locale\" -i versioninfo.rc -o versioninfo.lo" -o locale" -i versioninfo.rc -o versioninfo.obj
../libtool: eval: line 1115: unexpected EOF while looking for matching `"'
rm: unknown option -- o
Try 'rm --help' for more information.
make[5]: *** [Makefile:1621: versioninfo.lo] Error 1
make[5]: *** Waiting for unfinished jobs....
make[4]: *** [Makefile:687: all] Error 2
make[3]: *** [Makefile:517: all-recursive] Error 1
make[2]: *** [Makefile:449: all] Error 2
---- begin compiler messages -------
Regards,
taichi.
From 817e56fe4e4d980e44b3547f38d15ef81f0515b3 Mon Sep 17 00:00:00 2001
From: Taichi Haradaguchi <20001722@xxxxxxxxxxx>
Date: Fri, 06 Jan 2023 20:55:53 +0900
Subject: [PATCH] libgpg-error: upgrade to release 1.47
Change-Id: I330b5f92717c1c5f6c0637940dfe7c3ac7e58b21
---
diff --git a/download.lst b/download.lst
index fce7592..e38dec6 100644
--- a/download.lst
+++ b/download.lst
@@ -314,8 +314,8 @@
# three static lines
# so that git cherry-pick
# will not run into conflicts
-LIBGPGERROR_SHA256SUM := a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf
-LIBGPGERROR_TARBALL := libgpg-error-1.43.tar.bz2
+LIBGPGERROR_SHA256SUM := 9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb
+LIBGPGERROR_TARBALL := libgpg-error-1.47.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index 7ee849d..fd887fb 100644
--- a/external/libgpg-error/ExternalPackage_libgpg-error.mk
+++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk
@@ -15,7 +15,7 @@
ifeq ($(OS),LINUX)
-$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.32.1))
+$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.34.0))
else ifeq ($(OS),MACOSX)
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk
index 055cd3c..239d093 100644
--- a/external/libgpg-error/ExternalProject_libgpg-error.mk
+++ b/external/libgpg-error/ExternalProject_libgpg-error.mk
@@ -27,6 +27,8 @@
--disable-languages \
--disable-doc \
--disable-tests \
+ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
+ CFLAGS="$(CFLAGS) $(call gb_ExternalProject_get_build_flags,libgpg-error)" \
$(gb_WIN_GPG_platform_switches) \
&& $(MAKE) \
)
@@ -39,9 +41,8 @@
--disable-rpath \
--disable-languages \
--disable-doc \
- CFLAGS=" $(CFLAGS) $(call gb_ExternalProject_get_build_flags,libgpg-error)" \
- CPPFLAGS=" $(SOLARINC)" \
- $(if $(filter MSC,$(COM)),--force_use_syscfg=true) \
+ CFLAGS="$(CFLAGS) $(call gb_ExternalProject_get_build_flags,libgpg-error)" \
+ CPPFLAGS="$(SOLARINC)" \
$(gb_CONFIGURE_PLATFORMS) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
index 72ff130..ad25487 100644
--- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
+++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
@@ -14,14 +14,24 @@
$(eval $(call gb_UnpackedTarball_set_patchlevel,libgpg-error,0))
$(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
- $(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes.patch) \
- $(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-2.patch.1) \
- $(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-3.patch.1) \
- $(if $(filter MSC,$(COM)),external/libgpg-error/w32-disable-dllinit.patch.1) \
- external/libgpg-error/w32-build-fixes-4.patch \
- $(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-5.patch) \
- $(if $(filter LINUX,$(OS)),external/libgpg-error/libgpgerror-bundled-soname.patch.1) \
external/libgpg-error/clang-cl.patch \
+ external/libgpg-error/w32-build-fixes-4.patch \
))
+ifeq ($(COM),MSC)
+$(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
+ external/libgpg-error/w32-build-fixes.patch \
+ external/libgpg-error/w32-build-fixes-2.patch.1 \
+ external/libgpg-error/w32-build-fixes-3.patch.1 \
+ external/libgpg-error/w32-build-fixes-5.patch \
+ external/libgpg-error/w32-disable-dllinit.patch.1 \
+))
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
+ external/libgpg-error/libgpgerror-bundled-soname.patch.1 \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/external/libgpg-error/w32-build-fixes-2.patch.1 b/external/libgpg-error/w32-build-fixes-2.patch.1
index 0f8a8b3..2163dcf 100644
--- a/external/libgpg-error/w32-build-fixes-2.patch.1
+++ b/external/libgpg-error/w32-build-fixes-2.patch.1
@@ -1,17 +1,17 @@
diff -ru libgpg-error.orig/src/Makefile.in libgpg-error/src/Makefile.in
---- libgpg-error.orig/src/Makefile.in 2017-09-12 08:18:29.376536700 +0200
-+++ libgpg-error/src/Makefile.in 2017-09-12 08:57:11.648083800 +0200
-@@ -512,8 +512,7 @@
+--- libgpg-error.orig/src/Makefile.in 2023-04-06 17:30:13.000000000 +0900
++++ libgpg-error/src/Makefile.in 2023-06-22 19:20:29.641791400 +0900
+@@ -616,8 +616,7 @@
@HAVE_W32_SYSTEM_TRUE@arch_sources = w32-gettext.c w32-lock.c w32-lock-obj.h w32-thread.c \
@HAVE_W32_SYSTEM_TRUE@ w32-iconv.c w32-estream.c w32-reg.c spawn-w32.c
-@HAVE_W32_SYSTEM_TRUE@RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--@HAVE_W32_SYSTEM_TRUE@ -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS) $(CPPFLAGS)
-+@HAVE_W32_SYSTEM_TRUE@RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) -DLOCALEDIR=$(localedir) $(AM_CPPFLAGS)
+-@HAVE_W32_SYSTEM_TRUE@ $(libgpg_error_la_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS)
++@HAVE_W32_SYSTEM_TRUE@RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgpg_error_la_CPPFLAGS) $(AM_CPPFLAGS)
@HAVE_W32_SYSTEM_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
@HAVE_W32_SYSTEM_TRUE@SUFFIXES = .rc .lo
-@@ -1242,7 +1241,7 @@
+@@ -1619,7 +1618,7 @@
@HAVE_W32_SYSTEM_TRUE@xxxxxx:
@@ -20,12 +20,12 @@
@HAVE_W32_SYSTEM_TRUE@xxxxxxxxxxxxxx : gpg-error.w32-manifest
-@@ -1283,7 +1282,7 @@
+@@ -1660,7 +1659,7 @@
# It is correct to use $(CPP). We want the host's idea of the error codes.
- mkerrcodes.h: Makefile mkerrcodes.awk $(gpg_extra_headers)
+ mkerrcodes.h: Makefile mkerrcodes.awk
$(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@
-- $(CPP) $(CPPFLAGS) $(extra_cppflags) -P _$@ | grep GPG_ERR_ | \
-+ $(CPP) $(CPPFLAGS) $(extra_cppflags) _$@ | grep GPG_ERR_ | \
+- $(CPP) $(CPPFLAGS) -P _$@ | grep GPG_ERR_ | \
++ $(CPP) $(CPPFLAGS) _$@ | grep GPG_ERR_ | \
$(AWK) -f $(srcdir)/mkerrcodes.awk >$@
-rm _$@
diff --git a/external/libgpg-error/w32-build-fixes-5.patch b/external/libgpg-error/w32-build-fixes-5.patch
index 4e04e47..9c07b39 100644
--- a/external/libgpg-error/w32-build-fixes-5.patch
+++ b/external/libgpg-error/w32-build-fixes-5.patch
@@ -1,5 +1,5 @@
---- src/argparse.c 2021-11-03 13:44:56.000000000 +0100
-+++ src/argparse.c~ 2022-01-03 17:05:23.418077200 +0100
+--- src/argparse.c 2023-01-17 17:46:53.000000000 +0900
++++ src/argparse.c~ 2023-06-22 19:25:23.311437700 +0900
@@ -33,8 +33,12 @@
#include <stdarg.h>
#include <limits.h>
@@ -14,8 +14,8 @@
#include "gpgrt-int.h"
---- src/gpg-error.c 2020-06-06 00:18:40.199791000 +0200
-+++ src/gpg-error.c~ 2020-06-05 18:44:14.223182300 +0200
+--- src/gpg-error.c 2022-03-04 20:25:28.000000000 +0900
++++ src/gpg-error.c~ 2023-06-22 19:29:34.081164300 +0900
@@ -61,6 +61,11 @@
#define drop_locale_dir(dir)
#endif
@@ -28,7 +28,6 @@
static void
i18n_init (void)
{
-
--- src/spawn-w32.c~ 2022-01-03 16:33:24.000000000 +0100
+++ src/spawn-w32.c 2022-01-03 16:46:57.173841200 +0100
@@ -56,7 +56,7 @@
@@ -41,23 +40,23 @@
/* For HANDLE and the internal file descriptor (fd) of this module:
* HANDLE can be represented by an intptr_t which should be true for
---- src/logging.c 2020-06-05 18:58:59.254413200 +0200
-+++ src/logging.c~ 2019-12-12 15:23:37.000000000 +0100
+--- src/logging.c 2023-03-21 18:33:56.000000000 +0900
++++ src/logging.c~ 2023-06-22 19:34:34.298957600 +0900
@@ -44,7 +44,12 @@
# include <netinet/in.h>
# include <arpa/inet.h>
#endif /*!HAVE_W32_SYSTEM*/
+-#include <unistd.h>
+#ifdef _WIN32
+# include <io.h>
+# include <process.h>
+#else
+# include <unistd.h>
+#endif
--#include <unistd.h>
#include <fcntl.h>
/* #include <execinfo.h> */
-@@ -57,6 +53,15 @@
+@@ -53,6 +58,15 @@
#ifdef HAVE_W32_SYSTEM
@@ -73,40 +72,41 @@
# ifndef S_IRWXG
# define S_IRGRP S_IRUSR
# define S_IWGRP S_IWUSR
---- src/Makefile.am 2020-06-06 01:01:31.931459300 +0200
-+++ src/Makefile.am~ 2020-02-06 18:39:06.000000000 +0100
-@@ -213,7 +213,7 @@
- # without the extra_cppflags because they may include am -idirafter
- # which is not supported by the RC compiler.
- libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(extra_cppflags)
-+libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) -ladvapi32 $(LIBTHREAD)
+--- src/Makefile.am 2022-08-19 17:39:54.000000000 +0900
++++ src/Makefile.am~ 2023-06-22 19:37:15.902761000 +0900
+@@ -209,7 +209,7 @@
+ # $(srcdir)/gpg-error.vers
+
+ libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
-libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) $(LIBTHREAD)
++libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) -ladvapi32 $(LIBTHREAD)
gpg_error_SOURCES = strsource-sym.c strerror-sym.c gpg-error.c
gpg_error_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
---- src/Makefile.in 2020-06-06 01:01:31.931459300 +0200
-+++ src/Makefile.in~ 2020-02-06 18:39:06.000000000 +0100
-@@ -659,7 +659,7 @@
- # without the extra_cppflags because they may include am -idirafter
- # which is not supported by the RC compiler.
- libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(extra_cppflags)
-+libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) -ladvapi32 $(LIBTHREAD)
+--- src/Makefile.in 2023-04-06 17:30:13.000000000 +0900
++++ src/Makefile.in~ 2023-06-22 19:39:42.938471000 +0900
+@@ -663,7 +662,7 @@
+ # libgpg_error_la_DEPENDENCIES = \
+ # $(srcdir)/gpg-error.vers
+ libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
-libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) $(LIBTHREAD)
++libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) -ladvapi32 $(LIBTHREAD)
gpg_error_SOURCES = strsource-sym.c strerror-sym.c gpg-error.c
gpg_error_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
- -DLOCALEDIR=\"$(localedir)\" $(extra_cppflags)
---- src/sysutils.c 2020-06-06 00:23:52.457265500 +0200
-+++ src/sysutils.c~ 2019-12-12 15:23:37.000000000 +0100
-@@ -22,7 +22,11 @@
+ -DLOCALEDIR=\"$(localedir)\"
+--- src/sysutils.c 2022-08-02 21:53:50.000000000 +0900
++++ src/sysutils.c~ 2023-01-08 17:17:07.636268575 +0900
+@@ -22,7 +22,12 @@
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
+-#include <unistd.h>
+#ifdef _WIN32
+# include <io.h>
++# define W_OK 02
+#else
+# include <unistd.h>
+#endif
--#include <unistd.h>
#include <errno.h>
#ifdef HAVE_W32_SYSTEM
# include <windows.h>
@@ -132,10 +132,10 @@
const char *name);
+
+wchar_t *utf8_to_wchar (const char *string, size_t length, size_t *retlen);
---- src/w32-gettext.c 2020-06-06 00:33:24.680341900 +0200
-+++ src/w32-gettext.c~ 2020-06-05 18:44:14.254481700 +0200
-@@ -1355,7 +1355,7 @@
- is not defined. If LENGTH is zero and RETLEN NULL the fucntion
+--- src/w32-gettext.c 2022-03-04 21:44:26.000000000 +0900
++++ src/w32-gettext.c~ 2023-01-08 17:06:56.442564238 +0900
+@@ -1325,7 +1325,7 @@
+ is not defined. If LENGTH is zero and RETLEN NULL the function
assumes that STRING is a nul-terminated string and returns a
(wchar_t)0-terminated string. */
+wchar_t *
Attachment:
OpenPGP_0x079F07D3DD6C02B7.asc
Description: OpenPGP public key
Attachment:
OpenPGP_signature.asc
Description: OpenPGP digital signature
