From: Raphael Kubo da Costa <kubito@gmail.com>
Date: Wed, 2 Mar 2011 03:05:28 +0000 (+0000)
Subject: Fix build when the 'uint' typedef is already defined.
X-Git-Tag: v1.7~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eee860f9c63f9b5a6162d32a89e9dc9c98c24398;p=taglib

Fix build when the 'uint' typedef is already defined.

Using uint in those structs gave me the following error:

  /home/rakuco/kde4/src/kdesupport/taglib/taglib/riff/rifffile.cpp:38:
error: reference to 'uint' is ambiguous
  /usr/include/sys/types.h:56: error: candidates are: typedef unsigned
int uint

Is it really necessary to have those typedefs in taglib.h? It'd be
nice to at least check if they are not being redefined.

CCMAIL: lalinsky@gmail.com



git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1223282 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---

diff --git a/taglib/riff/rifffile.cpp b/taglib/riff/rifffile.cpp
index 46581e51..8d23bcd6 100644
--- a/taglib/riff/rifffile.cpp
+++ b/taglib/riff/rifffile.cpp
@@ -35,8 +35,8 @@ using namespace TagLib;
 struct Chunk
 {
   ByteVector name;
-  uint offset;
-  uint size;
+  TagLib::uint offset;
+  TagLib::uint size;
   char padding;
 };
 
@@ -51,7 +51,7 @@ public:
   }
   Endianness endianness;
   ByteVector type;
-  uint size;
+  TagLib::uint size;
   ByteVector format;
 
   std::vector<Chunk> chunks;