=== modified file 'ChangeLog' --- ChangeLog 2023-09-13 17:53:35 +0000 +++ ChangeLog 2023-09-16 10:04:24 +0000 @@ -1,3 +1,15 @@ +2023-09-16 Bruno Haible <bruno@clisp.org> + + Fix a misnomer. + * include/export.h (LIBICONV_SHLIB_EXPORTED): Renamed from + LIBICONV_DLL_EXPORTED. Prefer the term "shared library", since the term + "DLL" applies only to Windows. + * Makefile.devel (include/iconv.h.build.in): Insert + LIBICONV_SHLIB_EXPORTED instead of LIBICONV_DLL_EXPORTED. + * configure.ac (DLL_VARIABLE): Update comment. + * lib/Makefile.in (DEFS): Update comment. + * woe32dll/export.h: Update comment. + 2023-09-13 Bruno Haible <bruno@clisp.org> Simplify the library: Don't compile relocatable.c any more. === modified file 'Makefile.devel' --- Makefile.devel 2023-09-06 16:08:35 +0000 +++ Makefile.devel 2023-09-16 10:04:24 +0000 @@ -137,7 +137,7 @@ include/iconv.h.build.in : include/iconv.h.in include/export.h cat $< \ - | sed -e 's/extern \([^"]\)/extern LIBICONV_DLL_EXPORTED \1/' \ + | sed -e 's/extern \([^"]\)/extern LIBICONV_SHLIB_EXPORTED \1/' \ -e '/_LIBICONV_VERSION/r include/export.h' \ | sed -e '/_LIBICONV_VERSION/,/[*][/]$$/{/_LIBICONV_VERSION/!d;}' > $@ === modified file 'configure.ac' --- configure.ac 2023-09-06 16:08:35 +0000 +++ configure.ac 2023-09-16 10:04:24 +0000 @@ -197,9 +197,9 @@ /* On Windows, variables that may be in a DLL must be marked specially. The symbols marked with DLL_VARIABLE should be exported if and only if the object file gets included in a DLL. Libtool, on Windows platforms, defines - the C macro DLL_EXPORT (together with PIC) when compiling for a DLL - and does not define it when compiling an object file meant to be linked - statically into some executable. */ + the C macro DLL_EXPORT (together with PIC) when compiling for a shared + library (called DLL under Windows) and does not define it when compiling + an object file meant to be linked statically into some executable. */ #if defined _MSC_VER && defined DLL_EXPORT # define DLL_VARIABLE __declspec (dllimport) #else === modified file 'include/export.h' --- include/export.h 2023-09-06 16:08:35 +0000 +++ include/export.h 2023-09-16 10:04:24 +0000 @@ -15,7 +15,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. */ #if @HAVE_VISIBILITY@ && BUILDING_LIBICONV -# define LIBICONV_DLL_EXPORTED __attribute__((__visibility__("default"))) +# define LIBICONV_SHLIB_EXPORTED __attribute__((__visibility__("default"))) #elif defined _MSC_VER && BUILDING_LIBICONV /* When building with MSVC, exporting a symbol means that the object file contains a "linker directive" of the form /EXPORT:symbol. This can be @@ -23,14 +23,14 @@ "dumpbin /directives FILE" commands. The symbols from this file should be exported if and only if the object file gets included in a DLL. Libtool, on Windows platforms, defines - the C macro DLL_EXPORT (together with PIC) when compiling for a DLL - and does not define it when compiling an object file meant to be linked - statically into some executable. */ + the C macro DLL_EXPORT (together with PIC) when compiling for a shared + library (called DLL under Windows) and does not define it when compiling + an object file meant to be linked statically into some executable. */ # if defined DLL_EXPORT -# define LIBICONV_DLL_EXPORTED __declspec(dllexport) +# define LIBICONV_SHLIB_EXPORTED __declspec(dllexport) # else -# define LIBICONV_DLL_EXPORTED +# define LIBICONV_SHLIB_EXPORTED # endif #else -# define LIBICONV_DLL_EXPORTED +# define LIBICONV_SHLIB_EXPORTED #endif === modified file 'lib/Makefile.in' --- lib/Makefile.in 2023-09-13 17:53:35 +0000 +++ lib/Makefile.in 2023-09-16 10:04:24 +0000 @@ -19,8 +19,8 @@ LDFLAGS_yes = -Wl,--export-all-symbols LDFLAGS_no = INCLUDES = -I. -I$(srcdir) -I../include -I$(srcdir)/../include -I.. -I$(srcdir)/.. -# -DBUILDING_LIBICONV: Change expansion of LIBICONV_DLL_EXPORTED macro. -# -DBUILDING_LIBCHARSET: Change expansion of LIBCHARSET_DLL_EXPORTED macro in +# -DBUILDING_LIBICONV: Change expansion of LIBICONV_SHLIB_EXPORTED macro. +# -DBUILDING_LIBCHARSET: Change expansion of LIBCHARSET_SHLIB_EXPORTED macro in # localcharset.h. DEFS = -DBUILDING_LIBICONV -DBUILDING_LIBCHARSET @DEFS@ LIBTOOL = @LIBTOOL@ === modified file 'libcharset/ChangeLog' --- libcharset/ChangeLog 2023-09-06 16:08:35 +0000 +++ libcharset/ChangeLog 2023-09-16 10:04:24 +0000 @@ -1,3 +1,17 @@ +2023-09-16 Bruno Haible <bruno@clisp.org> + + Fix a misnomer. + * include/export.h (LIBCHARSET_SHLIB_EXPORTED): Renamed from + LIBCHARSET_DLL_EXPORTED. Prefer the term "shared library", since the + term "DLL" applies only to Windows. + * Makefile.devel (include/libcharset.h.build.in, + include/localcharset.h.build.in): Insert LIBCHARSET_SHLIB_EXPORTED + instead of LIBCHARSET_DLL_EXPORTED. + * lib/relocatable-stub.c (libcharset_set_relocation_prefix): Use + LIBCHARSET_SHLIB_EXPORTED instead of LIBCHARSET_DLL_EXPORTED. + * lib/Makefile.in (DEFS): Update comment. + * Makefile.in (install-lib): Update comment. + 2023-09-06 Bruno Haible <bruno@clisp.org> Don't export symbols from static MSVC .obj files. === modified file 'libcharset/Makefile.devel' --- libcharset/Makefile.devel 2023-09-06 16:08:35 +0000 +++ libcharset/Makefile.devel 2023-09-16 10:04:24 +0000 @@ -26,14 +26,14 @@ include/libcharset.h.build.in : include/libcharset.h.in include/export.h cat $< \ - | sed -e 's/extern \([^"]\)/extern LIBCHARSET_DLL_EXPORTED \1/' \ + | sed -e 's/extern \([^"]\)/extern LIBCHARSET_SHLIB_EXPORTED \1/' \ -e '/#define _LIBCHARSET_H/r include/export.h' \ | sed -e '/#define _LIBCHARSET_H/,/[*][/]$$/{/#define _LIBCHARSET_H/!d;}' \ > $@ include/localcharset.h.build.in : include/localcharset.h.in include/export.h cat $< \ - | sed -e 's/extern \([^"]\)/extern LIBCHARSET_DLL_EXPORTED \1/' \ + | sed -e 's/extern \([^"]\)/extern LIBCHARSET_SHLIB_EXPORTED \1/' \ -e '/#define _LOCALCHARSET_H/r include/export.h' \ | sed -e '/#define _LOCALCHARSET_H/,/[*][/]$$/{/#define _LOCALCHARSET_H/!d;}' \ > $@ === modified file 'libcharset/Makefile.in' --- libcharset/Makefile.in 2022-02-12 13:13:25 +0000 +++ libcharset/Makefile.in 2023-09-16 10:04:24 +0000 @@ -39,7 +39,7 @@ cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)' $(mkinstalldirs) $(includedir) $(INSTALL_DATA) include/libcharset.h.inst $(includedir)/libcharset.h -# Here, use the include file that contains LIBCHARSET_DLL_EXPORTED annotations. +# Here, use the include file that contains LIBCHARSET_SHLIB_EXPORTED annotations. $(INSTALL_DATA) include/localcharset.h $(includedir)/localcharset.h install : all force === modified file 'libcharset/include/export.h' --- libcharset/include/export.h 2023-09-06 16:08:35 +0000 +++ libcharset/include/export.h 2023-09-16 10:04:24 +0000 @@ -15,7 +15,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. */ #if @HAVE_VISIBILITY@ && BUILDING_LIBCHARSET -# define LIBCHARSET_DLL_EXPORTED __attribute__((__visibility__("default"))) +# define LIBCHARSET_SHLIB_EXPORTED __attribute__((__visibility__("default"))) #elif defined _MSC_VER && BUILDING_LIBCHARSET /* When building with MSVC, exporting a symbol means that the object file contains a "linker directive" of the form /EXPORT:symbol. This can be @@ -23,14 +23,14 @@ "dumpbin /directives FILE" commands. The symbols from this file should be exported if and only if the object file gets included in a DLL. Libtool, on Windows platforms, defines - the C macro DLL_EXPORT (together with PIC) when compiling for a DLL - and does not define it when compiling an object file meant to be linked - statically into some executable. */ + the C macro DLL_EXPORT (together with PIC) when compiling for a shared + library (called DLL under Windows) and does not define it when compiling + an object file meant to be linked statically into some executable. */ # if defined DLL_EXPORT -# define LIBCHARSET_DLL_EXPORTED __declspec(dllexport) +# define LIBCHARSET_SHLIB_EXPORTED __declspec(dllexport) # else -# define LIBCHARSET_DLL_EXPORTED +# define LIBCHARSET_SHLIB_EXPORTED # endif #else -# define LIBCHARSET_DLL_EXPORTED +# define LIBCHARSET_SHLIB_EXPORTED #endif === modified file 'libcharset/lib/Makefile.in' --- libcharset/lib/Makefile.in 2019-01-27 22:28:53 +0000 +++ libcharset/lib/Makefile.in 2023-09-16 10:04:24 +0000 @@ -17,7 +17,7 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. -I../include -# -DBUILDING_LIBCHARSET: Change expansion of LIBCHARSET_DLL_EXPORTED macro. +# -DBUILDING_LIBCHARSET: Change expansion of LIBCHARSET_SHLIB_EXPORTED macro. DEFS = -DBUILDING_LIBCHARSET @DEFS@ LIBTOOL = @LIBTOOL@ LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile === modified file 'libcharset/lib/relocatable-stub.c' --- libcharset/lib/relocatable-stub.c 2020-04-04 12:58:34 +0000 +++ libcharset/lib/relocatable-stub.c 2023-09-16 10:04:24 +0000 @@ -1,5 +1,5 @@ /* Provide relocatable packages. - Copyright (C) 2018 Free Software Foundation, Inc. + Copyright (C) 2018-2023 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2018. This program is free software; you can redistribute it and/or modify it @@ -19,7 +19,7 @@ #include "libcharset.h" -extern LIBCHARSET_DLL_EXPORTED void +extern LIBCHARSET_SHLIB_EXPORTED void libcharset_set_relocation_prefix (const char *orig_prefix, const char *curr_prefix); /* This is a stub for binary backward-compatibility. */ === modified file 'woe32dll/export.h' --- woe32dll/export.h 2023-09-07 11:50:13 +0000 +++ woe32dll/export.h 2023-09-16 10:04:24 +0000 @@ -55,9 +55,9 @@ to define a -DBUILDING_LIBXYZ flag for the library. Example: #ifdef BUILDING_LIBICONV - #define LIBICONV_DLL_EXPORTED __declspec(dllexport) + #define LIBICONV_SHLIB_EXPORTED __declspec(dllexport) #else - #define LIBICONV_DLL_EXPORTED __declspec(dllimport) + #define LIBICONV_SHLIB_EXPORTED __declspec(dllimport) #endif We use this technique for the libintl and the libiconv libraries.