Commit fa697a98 authored by Josh Coalson's avatar Josh Coalson
Browse files

rename some struct members to avoid C++ 'private' and 'protected' keywords

parent 07afedcb
...@@ -47,8 +47,8 @@ extern const char *FLAC__FileDecoderStateString[]; ...@@ -47,8 +47,8 @@ extern const char *FLAC__FileDecoderStateString[];
struct FLAC__FileDecoderProtected; struct FLAC__FileDecoderProtected;
struct FLAC__FileDecoderPrivate; struct FLAC__FileDecoderPrivate;
typedef struct { typedef struct {
struct FLAC__FileDecoderProtected *protected; struct FLAC__FileDecoderProtected *protected_; /* avoid the C++ keyword 'protected' */
struct FLAC__FileDecoderPrivate *private; struct FLAC__FileDecoderPrivate *private_; /* avoid the C++ keyword 'private' */
} FLAC__FileDecoder; } FLAC__FileDecoder;
/*********************************************************************** /***********************************************************************
......
...@@ -66,8 +66,8 @@ extern const char *FLAC__StreamDecoderErrorStatusString[]; ...@@ -66,8 +66,8 @@ extern const char *FLAC__StreamDecoderErrorStatusString[];
struct FLAC__StreamDecoderProtected; struct FLAC__StreamDecoderProtected;
struct FLAC__StreamDecoderPrivate; struct FLAC__StreamDecoderPrivate;
typedef struct { typedef struct {
struct FLAC__StreamDecoderProtected *protected; struct FLAC__StreamDecoderProtected *protected_; /* avoid the C++ keyword 'protected' */
struct FLAC__StreamDecoderPrivate *private; struct FLAC__StreamDecoderPrivate *private_; /* avoid the C++ keyword 'private' */
} FLAC__StreamDecoder; } FLAC__StreamDecoder;
/*********************************************************************** /***********************************************************************
......
...@@ -60,8 +60,8 @@ extern const char *FLAC__StreamEncoderWriteStatusString[]; ...@@ -60,8 +60,8 @@ extern const char *FLAC__StreamEncoderWriteStatusString[];
struct FLAC__StreamEncoderProtected; struct FLAC__StreamEncoderProtected;
struct FLAC__StreamEncoderPrivate; struct FLAC__StreamEncoderPrivate;
typedef struct { typedef struct {
struct FLAC__StreamEncoderProtected *protected; struct FLAC__StreamEncoderProtected *protected_; /* avoid the C++ keyword 'protected' */
struct FLAC__StreamEncoderPrivate *private; struct FLAC__StreamEncoderPrivate *private_; /* avoid the C++ keyword 'private' */
} FLAC__StreamEncoder; } FLAC__StreamEncoder;
/*********************************************************************** /***********************************************************************
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment