Mercurial > mplayer.hg
view stream/cdd.h @ 22001:2934974c366a
Remove illegal definition of underscored-prefixed symbol "__MODULE__":
All underscored-prefixed symbols have the right re-defined by the compiler, so it's definitely not safe to use any.
ICC doesn't seem to like it, GCC doesn't seem to care.
Original thread:
date: Jan 25, 2007 2:41 PM
subject: [MPlayer-dev-eng] [PATCH] remove illegal underscored-prefixed symbols
AND
date: 01/25/2007 11:43 AM
subject: Re: [MPlayer-dev-eng] [PATCH] compiling with Intel C
author | gpoirier |
---|---|
date | Fri, 26 Jan 2007 09:21:22 +0000 |
parents | 64d82a45a05d |
children | 3f0d00abc073 |
line wrap: on
line source
#ifndef __CDD_H__ #define __CDD_H__ #include "config.h" #ifndef HAVE_LIBCDIO #include <cdda_interface.h> #include <cdda_paranoia.h> #else #include <cdio/cdda.h> #include <cdio/paranoia.h> #endif typedef struct { char cddb_hello[1024]; unsigned long disc_id; unsigned int tracks; char *cache_dir; char *freedb_server; int freedb_proto_level; int anonymous; char category[100]; char *xmcd_file; size_t xmcd_file_size; void *user_data; } cddb_data_t; typedef struct { unsigned int min, sec, frame; } cd_toc_t; typedef struct cd_track { char *name; unsigned int track_nb; unsigned int min; unsigned int sec; unsigned int msec; unsigned long frame_begin; unsigned long frame_length; struct cd_track *prev; struct cd_track *next; } cd_track_t; typedef struct { char *artist; char *album; char *genre; unsigned int nb_tracks; unsigned int min; unsigned int sec; unsigned msec; cd_track_t *first; cd_track_t *last; cd_track_t *current; } cd_info_t; typedef struct { #ifndef HAVE_LIBCDIO cdrom_drive* cd; cdrom_paranoia* cdp; #else cdrom_drive_t* cd; cdrom_paranoia_t* cdp; #endif int sector; int start_sector; int end_sector; cd_info_t *cd_info; } cdda_priv; cd_info_t* cd_info_new(); void cd_info_free(cd_info_t *cd_info); cd_track_t* cd_info_add_track(cd_info_t *cd_info, char *track_name, unsigned int track_nb, unsigned int min, unsigned int sec, unsigned int msec, unsigned long frame_begin, unsigned long frame_length); cd_track_t* cd_info_get_track(cd_info_t *cd_info, unsigned int track_nb); void cd_info_debug(cd_info_t *cd_info); #endif // __CDD_H__