summaryrefslogtreecommitdiff
path: root/woe32dll/export.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-02-07 06:57:44 +0100
committerJörg Frings-Fürst <debian@jff.email>2022-02-07 06:57:44 +0100
commit6ffaa52cf732a84c0f8259dbc9b8183960ec5c33 (patch)
treed3136c22e3e805cfc0efe78412cce905a17e0c8d /woe32dll/export.h
parent591cbf5878b7d4105b275585b9db1324c9dfce56 (diff)
parentaf151c593704a40e10efb28d1e3dd59a23a661f3 (diff)
Merge branch 'release/debian/1.0-1'debian/1.0-1
Diffstat (limited to 'woe32dll/export.h')
-rw-r--r--woe32dll/export.h29
1 files changed, 21 insertions, 8 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. */