From 90f37b81832ff0fddaaf116c55f3f30a7d332afe Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sat, 11 Sep 2010 11:50:47 +0200 Subject: [PATCH] Introduced macro Libisofs_h_as_cpluspluS to avoid the definitions of struct iso_file_source and struct iso_stream when libisofs.h is included in C++ files. (The definitions contain members with name "class".) --- libisofs/libisofs.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libisofs/libisofs.h b/libisofs/libisofs.h index 80666cf..b133274 100644 --- a/libisofs/libisofs.h +++ b/libisofs/libisofs.h @@ -734,6 +734,7 @@ struct IsoFileSource_Iface */ }; +#ifndef Libisofs_h_as_cpluspluS /** * An IsoFile Source is a POSIX abstraction of a file. * @@ -745,6 +746,7 @@ struct iso_file_source int refcount; void *data; }; +#endif /* ! Libisofs_h_as_cpluspluS */ /** * Representation of file contents. It is an stream of bytes, functionally @@ -955,6 +957,7 @@ struct IsoStream_Iface }; +#ifndef Libisofs_h_as_cpluspluS /** * Representation of file contents as a stream of bytes. * @@ -966,6 +969,7 @@ struct iso_stream int refcount; void *data; }; +#endif /* ! Libisofs_h_as_cpluspluS */ /**