external/libgpg-error/w32-build-fixes-5.patch

   1 --- src/argparse.c      2021-11-03 13:44:56.000000000 +0100
   2 +++ src/argparse.c~     2022-01-03 17:05:23.418077200 +0100
   3 @@ -33,8 +33,12 @@
   4  #include <stdarg.h>
   5  #include <limits.h>
   6  #include <errno.h>
   7 -#include <unistd.h>
   8  #include <time.h>
   9 +#ifdef _WIN32
  10 +# define R_OK 04
  11 +# define strncasecmp _strnicmp
  12 +# define strcasecmp _stricmp
  13 +#endif
  14
  15  #include "gpgrt-int.h"
  16
  17 --- src/gpg-error.c     2020-06-06 00:18:40.199791000 +0200
  18 +++ src/gpg-error.c~    2020-06-05 18:44:14.223182300 +0200
  19 @@ -61,6 +61,11 @@
  20  #define drop_locale_dir(dir)
  21  #endif
  22
  23 +#ifdef _WIN32
  24 +# define strncasecmp _strnicmp
  25 +# define strcasecmp _stricmp
  26 +#endif
  27 +
  28  static void
  29  i18n_init (void)
  30  {
  31
  32 --- src/spawn-w32.c~  2022-01-03 16:33:24.000000000 +0100
  33 +++ src/spawn-w32.c       2022-01-03 16:46:57.173841200 +0100
  34 @@ -56,7 +56,7 @@
  35   * Previous versions interpreted X_OK as F_OK anyway, so we'll just
  36   * use F_OK directly. */
  37  #undef X_OK
  38 +#define X_OK 0
  39 -#define X_OK F_OK
  40
  41  /* For HANDLE and the internal file descriptor (fd) of this module:
  42   * HANDLE can be represented by an intptr_t which should be true for
  43
  44 --- src/logging.c       2020-06-05 18:58:59.254413200 +0200
  45 +++ src/logging.c~      2019-12-12 15:23:37.000000000 +0100
  46 @@ -44,7 +44,11 @@
  47  # include <netinet/in.h>
  48  # include <arpa/inet.h>
  49  #endif /*!HAVE_W32_SYSTEM*/
  50 +#ifdef _WIN32
  51 +# include <io.h>
  52 +#else
  53 +# include <unistd.h>
  54 +#endif
  55 -#include <unistd.h>
  56  #include <fcntl.h>
  57  /* #include <execinfo.h> */
  58
  59 @@ -57,6 +53,15 @@
  60
  61
  62  #ifdef HAVE_W32_SYSTEM
  63 +# ifndef  S_IRUSR
  64 +#  define S_IRUSR _S_IREAD
  65 +# endif
  66 +# ifndef  S_IWUSR
  67 +#  define S_IWUSR _S_IWRITE
  68 +# endif
  69 +# ifndef  S_IXUSR
  70 +#  define S_IXUSR 0x00400000
  71 +# endif
  72  # ifndef S_IRWXG
  73  #  define S_IRGRP S_IRUSR
  74  #  define S_IWGRP S_IWUSR
  75 --- src/Makefile.am     2020-06-06 01:01:31.931459300 +0200
  76 +++ src/Makefile.am~    2020-02-06 18:39:06.000000000 +0100
  77 @@ -213,7 +213,7 @@
  78  # without the extra_cppflags because they may include am -idirafter
  79  # which is not supported by the RC compiler.
  80  libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(extra_cppflags)
  81 +libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) -ladvapi32 $(LIBTHREAD)
  82 -libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) $(LIBTHREAD)
  83
  84  gpg_error_SOURCES = strsource-sym.c strerror-sym.c gpg-error.c
  85  gpg_error_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
  86 --- src/Makefile.in     2020-06-06 01:01:31.931459300 +0200
  87 +++ src/Makefile.in~    2020-02-06 18:39:06.000000000 +0100
  88 @@ -659,7 +659,7 @@
  89  # without the extra_cppflags because they may include am -idirafter
  90  # which is not supported by the RC compiler.
  91  libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(extra_cppflags)
  92 +libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) -ladvapi32 $(LIBTHREAD)
  93 -libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) $(LIBTHREAD)
  94  gpg_error_SOURCES = strsource-sym.c strerror-sym.c gpg-error.c
  95  gpg_error_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
  96                       -DLOCALEDIR=\"$(localedir)\" $(extra_cppflags)
  97 --- src/sysutils.c      2020-06-06 00:23:52.457265500 +0200
  98 +++ src/sysutils.c~     2019-12-12 15:23:37.000000000 +0100
  99 @@ -22,7 +22,11 @@
 100  #include <stdlib.h>
 101  #include <stdint.h>
 102  #include <string.h>
 103 +#ifdef _WIN32
 104 +# include <io.h>
 105 +#else
 106 +# include <unistd.h>
 107 +#endif
 108 -#include <unistd.h>
 109  #include <errno.h>
 110  #ifdef HAVE_W32_SYSTEM
 111  # include <windows.h>
 112 --- src/visibility.c    2020-06-05 18:54:56.410442900 +0200
 113 +++ src/visibility.c~   2019-01-04 12:56:54.000000000 +0100
 114 @@ -1067,11 +1067,7 @@
 115  _gpgrt_log_assert (const char *expr, const char *file,
 116                     int line, const char *func)
 117  {
 118 -#ifdef GPGRT_HAVE_MACRO_FUNCTION
 119    _gpgrt__log_assert (expr, file, line, func);
 120 -#else
 121 -  _gpgrt__log_assert (expr, file, line);
 122 -#endif
 123  }
 124
 125  \f
 126 --- src/w32-add.h       2020-06-06 00:32:38.502203300 +0200
 127 +++ src/w32-add.h~      2018-12-07 14:48:19.000000000 +0100
 128 @@ -65,3 +65,5 @@
 129  char *gpgrt_w32_reg_query_string (const char *root,
 130                                    const char *dir,
 131                                    const char *name);
 132 +
 133 +wchar_t *utf8_to_wchar (const char *string, size_t length, size_t *retlen);
 134 --- src/w32-gettext.c   2020-06-06 00:33:24.680341900 +0200
 135 +++ src/w32-gettext.c~  2020-06-05 18:44:14.254481700 +0200
 136 @@ -1355,7 +1355,7 @@
 137     is not defined.  If LENGTH is zero and RETLEN NULL the fucntion
 138     assumes that STRING is a nul-terminated string and returns a
 139     (wchar_t)0-terminated string.  */
 140 +wchar_t *
 141 -static wchar_t *
 142  utf8_to_wchar (const char *string, size_t length, size_t *retlen)
 143  {
 144    int n;