diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-01-08 11:53:52 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-01-08 11:53:52 +0100 |
| commit | fa838e76139763f902c7d27cb9e1d393ed6a15e4 (patch) | |
| tree | 7d0ae09775ea950056193eaa2ca93844299d46f1 /woe32dll/export.h | |
| parent | c78359d9542c86b972aac373efcf7bc7a8a560e5 (diff) | |
| parent | 2959e59fab3bab834368adefd90bd4b1b094366b (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'woe32dll/export.h')
| -rw-r--r-- | woe32dll/export.h | 29 |
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. */ |