diff options
| author | Ian Lance Taylor <iant@google.com> | 2009-07-25 06:28:16 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2009-07-25 06:28:16 +0000 |
| commit | 330b922f19394dccb7f3d00ed9dd0d4223787a28 (patch) | |
| tree | d8fbeeedab192d77af35ac46c8c0b458e3da1838 /include | |
| parent | 67a6e8167985001be8a50485a8cd8a0d0355a363 (diff) | |
| download | gcc-330b922f19394dccb7f3d00ed9dd0d4223787a28.zip gcc-330b922f19394dccb7f3d00ed9dd0d4223787a28.tar.gz gcc-330b922f19394dccb7f3d00ed9dd0d4223787a28.tar.bz2 | |
re PR bootstrap/40854 (Conflicting crc32 functions in libiberty and zlib)
include/:
PR bootstrap/40854
* libiberty.h (xcrc32): Rename from crc32.
libiberty/:
PR bootstrap/40854
* crc32.c (xcrc32): Rename from crc32.
From-SVN: r150075
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/libiberty.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 6aba775..4bd5e81 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,5 +1,10 @@ 2009-07-24 Ian Lance Taylor <iant@google.com> + PR bootstrap/40854 + * libiberty.h (xcrc32): Rename from crc32. + +2009-07-24 Ian Lance Taylor <iant@google.com> + * libiberty.h (crc32): Declare. 2009-07-20 Cary Coutant <ccoutant@google.com> diff --git a/include/libiberty.h b/include/libiberty.h index e50ad64..a7716e4 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -313,7 +313,7 @@ extern double physmem_total (void); extern double physmem_available (void); /* Compute the 32-bit CRC of a block of memory. */ -extern unsigned int crc32 (const unsigned char *, int, unsigned int); +extern unsigned int xcrc32 (const unsigned char *, int, unsigned int); /* These macros provide a K&R/C89/C++-friendly way of allocating structures with nice encapsulation. The XDELETE*() macros are technically |