diff options
Diffstat (limited to 'src/input/vcd/libcdio/cdio/util.h')
| -rw-r--r-- | src/input/vcd/libcdio/cdio/util.h | 39 |
1 files changed, 30 insertions, 9 deletions
diff --git a/src/input/vcd/libcdio/cdio/util.h b/src/input/vcd/libcdio/cdio/util.h index 5142653ad..3cea313b4 100644 --- a/src/input/vcd/libcdio/cdio/util.h +++ b/src/input/vcd/libcdio/cdio/util.h @@ -1,7 +1,8 @@ /* - $Id: util.h,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $ + $Id: util.h,v 1.3 2005/01/01 02:43:58 rockyb Exp $ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org> + Copyright (C) 2004 Rocky Bernstein <rocky@panix.com> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -71,6 +72,16 @@ _cdio_ofs_add (unsigned offset, unsigned length, int blocksize) return offset; } +static inline const char * +_cdio_bool_str (bool b) +{ + return b ? "yes" : "no"; +} + +#ifdef __cplusplus +extern "C" { +#endif + void * _cdio_malloc (size_t size); @@ -92,16 +103,26 @@ _cdio_strlenv(char **str_array); char ** _cdio_strsplit(const char str[], char delim); -static inline const char * -_cdio_bool_str (bool b) -{ - return b ? "yes" : "no"; -} +uint8_t cdio_to_bcd8(uint8_t n); +uint8_t cdio_from_bcd8(uint8_t p); -/* BCD */ +#if defined(__GNUC__) && __GNUC__ >= 3 +static inline __attribute__((deprecated)) +uint8_t to_bcd8(uint8_t n) { + return cdio_to_bcd8(n); +} +static inline __attribute__((deprecated)) +uint8_t from_bcd8(uint8_t p) { + return cdio_from_bcd8(p); +} +#else +#define to_bcd8 cdio_to_bcd8 +#define from_bcd8 cdio_from_bcd8 +#endif -uint8_t to_bcd8(uint8_t n); -uint8_t from_bcd8(uint8_t p); +#ifdef __cplusplus +} +#endif #endif /* __CDIO_UTIL_H__ */ |