diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-03 17:14:19 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-03 17:14:19 +0000 |
| commit | 85973068cc09855aa510e9cea6dc54c05fe0420d (patch) | |
| tree | c31c8be8d340c9cbc1d414bf5c8dea21c4c92f27 /wsutil | |
| parent | 7176e06a630c62bdf93553e4317e1b852bfcf1e9 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48038
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/mpeg-audio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wsutil/mpeg-audio.h b/wsutil/mpeg-audio.h index 4d3ad68bc0..4b3c40983a 100644 --- a/wsutil/mpeg-audio.h +++ b/wsutil/mpeg-audio.h @@ -33,7 +33,7 @@ struct mpa { unsigned int copyright :1; unsigned int modeext :2; unsigned int mode :2; - unsigned int private :1; + unsigned int priv :1; unsigned int padding :1; unsigned int frequency :2; unsigned int bitrate :4; @@ -65,7 +65,7 @@ struct mpa { (mpa)->bitrate = MPA_UNMARSHAL_BITRATE(n); \ (mpa)->frequency = MPA_UNMARSHAL_FREQUENCY(n); \ (mpa)->padding = MPA_UNMARSHAL_PADDING(n); \ - (mpa)->private = MPA_UNMARSHAL_PRIVATE(n); \ + (mpa)->priv = MPA_UNMARSHAL_PRIVATE(n); \ (mpa)->mode = MPA_UNMARSHAL_MODE(n); \ (mpa)->modeext = MPA_UNMARSHAL_MODEEXT(n); \ (mpa)->copyright = MPA_UNMARSHAL_COPYRIGHT(n); \ |