Make C++ compatible.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
$Id: cdda.h,v 1.21 2005/04/30 07:15:51 rocky Exp $
|
||||
$Id: cdda.h,v 1.22 2005/08/27 14:25:58 rocky Exp $
|
||||
|
||||
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
|
||||
Copyright (C) 2001 Xiph.org
|
||||
@@ -32,6 +32,10 @@
|
||||
#include <cdio/cdio.h>
|
||||
#include <cdio/paranoia.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
extern enum paranoia_cdda_enums {
|
||||
CDDA_MESSAGE_FORGETIT = 0,
|
||||
CDDA_MESSAGE_PRINTIT = 1,
|
||||
@@ -177,18 +181,19 @@ extern enum paranoia_jitter_enums {
|
||||
extern cdrom_drive_t *cdio_cddap_find_a_cdrom(int messagedest,
|
||||
char **ppsz_message);
|
||||
|
||||
/** Returns a paranoia CD-ROM drive object with a CD-DA in it.
|
||||
/** Returns a paranoia CD-ROM drive object with a CD-DA in it or NULL
|
||||
if there was an error.
|
||||
@see cdio_cddap_identify_cdio
|
||||
*/
|
||||
extern cdrom_drive_t *cdio_cddap_identify(const char *psz_device,
|
||||
int messagedest,
|
||||
char **ppsz_message);
|
||||
|
||||
/** Returns a paranoia CD-ROM drive object with a CD-DA in it. In
|
||||
contrast to cdio_cddap_identify, we start out with an initialized
|
||||
p_cdio object. For example you may have used that for other
|
||||
purposes such as to get CDDB/CD-Text information. @see
|
||||
cdio_cddap_identify
|
||||
/** Returns a paranoia CD-ROM drive object with a CD-DA in it or NULL
|
||||
if there was an error. In contrast to cdio_cddap_identify, we
|
||||
start out with an initialized p_cdio object. For example you may
|
||||
have used that for other purposes such as to get CDDB/CD-Text
|
||||
information. @see cdio_cddap_identify
|
||||
*/
|
||||
cdrom_drive_t *cdio_cddap_identify_cdio(CdIo_t *p_cdio,
|
||||
int messagedest, char **ppsz_messages);
|
||||
@@ -374,5 +379,9 @@ const char *strerror_tr[]={
|
||||
#define cdda_disc_lastsector cdio_cddap_disc_lastsector
|
||||
#endif /*DO_NOT_WANT_PARANOIA_COMPATIBILITY*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /*_CDDA_INTERFACE_H_*/
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
$Id: rock.h,v 1.8 2005/02/22 10:42:50 rocky Exp $
|
||||
$Id: rock.h,v 1.9 2005/08/27 14:25:58 rocky Exp $
|
||||
|
||||
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
|
||||
|
||||
@@ -33,6 +33,10 @@
|
||||
|
||||
#include <cdio/types.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
/*! An enumeration for some of the ISO_ROCK_* #defines below. This isn't
|
||||
really an enumeration one would really use in a program it is to
|
||||
be helpful in debuggers where wants just to refer to the ISO_ROCK_*
|
||||
@@ -358,6 +362,10 @@ extern iso_rock_nm_flag_t iso_rock_nm_flag;
|
||||
extern iso_rock_sl_flag_t iso_rock_sl_flag;
|
||||
extern iso_rock_tf_flag_t iso_rock_tf_flag;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* __ISO_ROCK_H__ */
|
||||
|
||||
/*
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
$Id: xa.h,v 1.15 2005/02/20 10:21:01 rocky Exp $
|
||||
$Id: xa.h,v 1.16 2005/08/27 14:25:58 rocky Exp $
|
||||
|
||||
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
|
||||
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
|
||||
@@ -36,6 +36,10 @@
|
||||
#ifndef __CDIO_XA_H__
|
||||
#define __CDIO_XA_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
/*! An enumeration for some of the XA_* #defines below. This isn't
|
||||
really an enumeration one would really use in a program it is to
|
||||
be helpful in debuggers where wants just to refer to the XA_*
|
||||
@@ -179,6 +183,10 @@ iso9660_xa_t *
|
||||
iso9660_xa_init (iso9660_xa_t *_xa, uint16_t uid, uint16_t gid, uint16_t attr,
|
||||
uint8_t filenum);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* __CDIO_XA_H__ */
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user