diff options
| -rw-r--r-- | CONTRIBUTORS | 4 | ||||
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | libdtv/libsi/include/libsi.h | 1 | ||||
| -rw-r--r-- | libdtv/libsi/si_parser.c | 4 |
4 files changed, 9 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 566fb374..b1714dd4 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -749,3 +749,7 @@ Kenneth Aafløy <ke-aa@frisurf.no> Ernst Fürst <ernstfuerst@swissonline.ch> for reporting a crash in case a VFAT file system is used without compiling VDR with VFAT=1 + +Reinhard Nissl <rnissl@gmx.de> + for reporting a name clash because of function crc32() in libdtv/libsi/si_parser.c + when using other libraries that also implement a function by that name @@ -2295,3 +2295,6 @@ Video Disk Recorder Revision History In order to do this, the cDevice was given a new member function GetVideoSystem(). - Fixed two warnings when compiling with gcc 3.3.1 (thanks to Alfred Zastrow for reporting this). +- Made crc32() a static function in libdtv/libsi/si_parser.c to avoid a name clash + when using other libraries that also implement a function by that name (thanks + to Reinhard Nissl for reporting this one). diff --git a/libdtv/libsi/include/libsi.h b/libdtv/libsi/include/libsi.h index fca96ba7..b4dad887 100644 --- a/libdtv/libsi/include/libsi.h +++ b/libdtv/libsi/include/libsi.h @@ -1226,7 +1226,6 @@ void siParseDescriptors (struct LIST *, u_char *, int, u_char); void siParseDescriptor (struct LIST *, u_char *); char *siGetDescriptorText (u_char *, int); char *siGetDescriptorName (u_char *, int); -u_long crc32 (char *data, int len); /* si_debug_services.c */ diff --git a/libdtv/libsi/si_parser.c b/libdtv/libsi/si_parser.c index e69718db..896c5ab9 100644 --- a/libdtv/libsi/si_parser.c +++ b/libdtv/libsi/si_parser.c @@ -36,7 +36,7 @@ #include "libsi.h" #include "si_tables.h" - +static u_long crc32 (char *data, int len); struct LIST *siParsePAT (u_char *Buffer) { @@ -1323,7 +1323,7 @@ static u_long crc_table[256] = { 0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668, 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4}; -u_long crc32 (char *data, int len) +static u_long crc32 (char *data, int len) { register int i; u_long crc = 0xffffffff; |