Mercurial > gnulib
changeset 40064:999aaec88bf8
bitset, crypto/gc: fix conflicts with Solaris 11
* lib/bitset.h (_GL_BITSET_H): Rename from _BITSET_H, to
avoid clash with Solaris 11 <sys/bitset.h>.
* lib/gc.h (_GL_GC_H): Rename from GC_H, to avoid clash
with Solaris 11 <xorg/gc.h>.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Thu, 03 Jan 2019 22:36:21 -0800 |
| parents | d9aa46720207 |
| children | 88b2ff37d1ab |
| files | ChangeLog lib/bitset.h lib/gc.h |
| diffstat | 3 files changed, 14 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jan 04 06:22:00 2019 +0100 +++ b/ChangeLog Thu Jan 03 22:36:21 2019 -0800 @@ -1,3 +1,11 @@ +2019-01-03 Paul Eggert <eggert@cs.ucla.edu> + + bitset, crypto/gc: fix conflicts with Solaris 11 + * lib/bitset.h (_GL_BITSET_H): Rename from _BITSET_H, to + avoid clash with Solaris 11 <sys/bitset.h>. + * lib/gc.h (_GL_GC_H): Rename from GC_H, to avoid clash + with Solaris 11 <xorg/gc.h>. + 2019-01-04 Bruno Haible <bruno@clisp.org> safe-read, safe-write: Fix conflict with Illumos-Joyent <sys/limits.h>.
--- a/lib/bitset.h Fri Jan 04 06:22:00 2019 +0100 +++ b/lib/bitset.h Thu Jan 03 22:36:21 2019 -0800 @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _BITSET_H -#define _BITSET_H +#ifndef _GL_BITSET_H +#define _GL_BITSET_H /* This file is the public interface to the bitset abstract data type. Only use the functions and macros defined in this file. */ @@ -385,4 +385,4 @@ /* Function to debug bitset stats from debugger. */ void debug_bitset_stats (void); -#endif /* _BITSET_H */ +#endif /* _GL_BITSET_H */