[vlc-devel] libcdio-0.77 Release changes the typedef for paranoia_mod_t

[Stone]

Current VLC fails when building against the libcdio-0.77 Release. Changes to
the paranoia.h header file now include a typedef for paranoia_mod_t.
paranoia_mod_t was previously undefined in older versions of paranoia.h.

if /var/local/vlc.cvs/vlc-trunk/debian/gcc-snapshot -DHAVE_CONFIG_H -I. -I.
-I../../..   -DSYS_LINUX -I../../../include `top_builddir="../../.."
../../../vlc-config --cflags plugin cddax` -Wsign-compare -Wall  -pipe -MT
libcddax_plugin_a-access.o -MD -MP -MF ".deps/libcddax_plugin_a-access.Tpo"
-c -o libcddax_plugin_a-access.o `test -f 'access.c' || echo './'`access.c;
\
        then mv -f ".deps/libcddax_plugin_a-access.Tpo"
".deps/libcddax_plugin_a-access.Po"; else rm -f ".deps/libcddax_plugin_a-
access.Tpo"; exit 1; fi
In file included from access.c:30:
cdda.h:78: error: conflicting types for 'paranoia_mode_t'
/usr/include/cdio/paranoia.h:60: error: previous declaration of
'paranoia_mode_t' was here
make[7]: *** [libcddax_plugin_a-access.o] Error 1

/usr/include/cdio/paranoia.h:

typedef enum  {
  PARANOIA_MODE_DISABLE   =  0x00, /**< No fixups */
  PARANOIA_MODE_VERIFY    =  0x01, /**< Verify data integrety in overlap
area*/
  PARANOIA_MODE_FRAGMENT  =  0x02, /**< unsupported */
  PARANOIA_MODE_OVERLAP   =  0x04, /**< Perform overlapped reads */
  PARANOIA_MODE_SCRATCH   =  0x08, /**< unsupported */
  PARANOIA_MODE_REPAIR    =  0x10, /**< unsupported */
  PARANOIA_MODE_NEVERSKIP =  0x20, /**< Do not skip failed reads (retry
                                      maxretries) */
  PARANOIA_MODE_FULL      =  0xff, /**< Maximum paranoia - all of the above
                                        (except disable) */
} paranoia_mode_t;

vlc-trunk/modules/access/cdda/cdda.h:

typedef enum {
  paranoia_none    = 0, /* Note: We make use of 0 as being the same as false
*/
  paranoia_overlap = 1,
  paranoia_full    = 2
} paranoia_mode_t;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20060326/add9768a/attachment.html>