Merge branch 'feature/upstream' into develop

2 files changed, 43 insertions, 14 deletions

diff --git a/woe32dll/export.h b/woe32dll/export.h
index b3659241..b17d9d3d 100644
--- a/woe32dll/export.h
+++ b/woe32dll/export.h
@@ -1,19 +1,28 @@
 /* Exporting symbols from Cygwin shared libraries.
-   Copyright (C) 2006, 2011-2012 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011-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
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
+   This program is free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU Lesser General Public License for more details.
 
    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/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* There are four ways to build shared libraries on Cygwin:
 
@@ -89,12 +98,16 @@
    the effect of no longer exporting the functions! - until the option
    --export-all-symbols is used.
 
-   See <http://www.haible.de/bruno/woe32dll.html> for more details.  */
+   See <https://haible.de/bruno/woe32dll.html> for more details.  */
 
 #if defined __GNUC__ /* GCC compiler, GNU toolchain */
 
  /* IMP(x) is a symbol that contains the address of x.  */
-# define IMP(x) _imp__##x
+# 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
     pseudo-variable IMP(x) is available.  */
diff --git a/woe32dll/unistring-exports.c b/woe32dll/unistring-exports.c
index 29b25e8b..b7feb5d8 100644
--- a/woe32dll/unistring-exports.c
+++ b/woe32dll/unistring-exports.c
@@ -1,19 +1,28 @@
 /* List of exported symbols of libunistring on Cygwin.
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006-2022 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
-   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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
+   This program is free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU Lesser General Public License for more details.
 
    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/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include "woe32dll/export.h"
 
@@ -82,6 +91,12 @@ VARIABLE(UC_PROPERTY_DECIMAL_DIGIT)
 VARIABLE(UC_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT)
 VARIABLE(UC_PROPERTY_DEPRECATED)
 VARIABLE(UC_PROPERTY_DIACRITIC)
+VARIABLE(UC_PROPERTY_EMOJI)
+VARIABLE(UC_PROPERTY_EMOJI_COMPONENT)
+VARIABLE(UC_PROPERTY_EMOJI_MODIFIER)
+VARIABLE(UC_PROPERTY_EMOJI_MODIFIER_BASE)
+VARIABLE(UC_PROPERTY_EMOJI_PRESENTATION)
+VARIABLE(UC_PROPERTY_EXTENDED_PICTOGRAPHIC)
 VARIABLE(UC_PROPERTY_EXTENDER)
 VARIABLE(UC_PROPERTY_FORMAT_CONTROL)
 VARIABLE(UC_PROPERTY_GRAPHEME_BASE)
@@ -121,6 +136,7 @@ VARIABLE(UC_PROPERTY_PRIVATE_USE)
 VARIABLE(UC_PROPERTY_PUNCTUATION)
 VARIABLE(UC_PROPERTY_QUOTATION_MARK)
 VARIABLE(UC_PROPERTY_RADICAL)
+VARIABLE(UC_PROPERTY_REGIONAL_INDICATOR)
 VARIABLE(UC_PROPERTY_SENTENCE_TERMINAL)
 VARIABLE(UC_PROPERTY_SOFT_DOTTED)
 VARIABLE(UC_PROPERTY_SPACE)