]> git.ipfire.org Git - thirdparty/gettext.git/commit
Avoid a module name and include file name collision with gnulib.
authorBruno Haible <bruno@clisp.org>
Sat, 4 Jul 2020 20:21:58 +0000 (22:21 +0200)
committerBruno Haible <bruno@clisp.org>
Sat, 4 Jul 2020 20:23:08 +0000 (22:23 +0200)
commitc3e956dbf8b567f873c134c4b80279a9d5185d08
tree2a8ae5251ad6f8d77a60b130c1e2b69b5a7f3eab
parent478eabdb3af0b7ea44a4064cedb315adf62a9afb
Avoid a module name and include file name collision with gnulib.

* gnulib-local/lib/mem-hash-map.h: Renamed from gnulib-local/lib/hash.h.
* gnulib-local/lib/mem-hash-map.c: Renamed from gnulib-local/lib/hash.c.
Include mem-hash-map.h instead of hash.h.
* gnulib-local/modules/mem-hash-map: Renamed from gnulib-local/modules/hash.
Update.
* gnulib-local/Makefile.am (EXTRA_DIST): Update.
* autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC, GNULIB_MODULES_LIBGETTEXTPO):
Update.
* libtextstyle/gnulib-local/modules/term-styled-ostream (Depends-on): Likewise.
* gettext-tools/src/its.c: Include mem-hash-map.h instead of hash.h.
* gettext-tools/src/locating-rule.c: Likewise.
* gettext-tools/src/message.c: Likewise.
* gettext-tools/src/message.h: Likewise.
* gettext-tools/src/read-desktop.h: Likewise.
* gettext-tools/src/write-mo.c: Likewise.
* gettext-tools/src/write-qt.c: Likewise.
* gettext-tools/src/x-c.c: Likewise.
* gettext-tools/src/x-csharp.c: Likewise.
* gettext-tools/src/x-desktop.c: Likewise.
* gettext-tools/src/x-elisp.c: Likewise.
* gettext-tools/src/x-java.c: Likewise.
* gettext-tools/src/x-librep.c: Likewise.
* gettext-tools/src/x-lisp.c: Likewise.
* gettext-tools/src/x-scheme.c: Likewise.
* gettext-tools/src/x-sh.c: Likewise.
* gettext-tools/src/x-tcl.c: Likewise.
* gettext-tools/src/x-vala.c: Likewise.
* gettext-tools/src/xg-arglist-callshape.h: Likewise.
* gettext-tools/src/xg-arglist-context.h: Likewise.
* libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c: Likewise.
30 files changed:
.gitignore
autogen.sh
gettext-tools/src/its.c
gettext-tools/src/locating-rule.c
gettext-tools/src/message.c
gettext-tools/src/message.h
gettext-tools/src/read-desktop.h
gettext-tools/src/write-mo.c
gettext-tools/src/write-qt.c
gettext-tools/src/x-c.c
gettext-tools/src/x-csharp.c
gettext-tools/src/x-desktop.c
gettext-tools/src/x-elisp.c
gettext-tools/src/x-java.c
gettext-tools/src/x-librep.c
gettext-tools/src/x-lisp.c
gettext-tools/src/x-scheme.c
gettext-tools/src/x-sh.c
gettext-tools/src/x-tcl.c
gettext-tools/src/x-vala.c
gettext-tools/src/xg-arglist-callshape.h
gettext-tools/src/xg-arglist-context.h
gnulib-local/Makefile.am
gnulib-local/lib/mem-hash-map.c [moved from gnulib-local/lib/hash.c with 98% similarity]
gnulib-local/lib/mem-hash-map.h [moved from gnulib-local/lib/hash.h with 100% similarity]
gnulib-local/modules/hash [deleted file]
gnulib-local/modules/mem-hash-map [new file with mode: 0644]
libtextstyle/.gitignore
libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c
libtextstyle/gnulib-local/modules/term-styled-ostream