From 644fe203f6b21b1232d6a77fe7ead6911cba3c64 Mon Sep 17 00:00:00 2001
From: Jonathan Marshall <jmarshall@never.you.mind>
Date: Sun, 12 May 2013 10:58:15 +1200
Subject: [PATCH] remove undef of byte workarounds now that we don't define it
 in PlatformDefs.h

---
 lib/UnrarXLib/rartypes.hpp                       | 2 --
 xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibMad.h | 2 --
 xbmc/music/tags/TagLoaderTagLib.cpp              | 1 -
 xbmc/music/tags/TagLoaderTagLib.h                | 1 -
 4 files changed, 6 deletions(-)

diff --git a/lib/UnrarXLib/rartypes.hpp b/lib/UnrarXLib/rartypes.hpp
index 33a1eb6b9812c..9e4f640fec926 100644
--- a/lib/UnrarXLib/rartypes.hpp
+++ b/lib/UnrarXLib/rartypes.hpp
@@ -1,9 +1,7 @@
 #ifndef _RAR_TYPES_
 #define _RAR_TYPES_
 
-#ifndef byte
 typedef unsigned char    byte;   //8 bits
-#endif
 typedef unsigned short   ushort; //preferably 16 bits, but can be more
 typedef unsigned int     uint;   //32 bits or more
 
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibMad.h b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibMad.h
index 9177cca78f869..55cc80d3e05fc 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibMad.h
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibMad.h
@@ -22,8 +22,6 @@
 #if (defined HAVE_CONFIG_H) && (!defined WIN32)
   #include "config.h"
 #endif
-/* undefine byte from PlatformDefs.h since it's used in mad.h */
-#undef byte
 #if defined(_LINUX) || defined(TARGET_DARWIN)
   #include <mad.h>
 #else
diff --git a/xbmc/music/tags/TagLoaderTagLib.cpp b/xbmc/music/tags/TagLoaderTagLib.cpp
index 65075e901fb69..248fe5830352c 100644
--- a/xbmc/music/tags/TagLoaderTagLib.cpp
+++ b/xbmc/music/tags/TagLoaderTagLib.cpp
@@ -36,7 +36,6 @@
 #include <taglib/unsynchronizedlyricsframe.h>
 #include <taglib/attachedpictureframe.h>
 
-#undef byte
 #include <taglib/tstring.h>
 #include <taglib/tpropertymap.h>
 
diff --git a/xbmc/music/tags/TagLoaderTagLib.h b/xbmc/music/tags/TagLoaderTagLib.h
index 35778d514bbbe..4614768cffbde 100644
--- a/xbmc/music/tags/TagLoaderTagLib.h
+++ b/xbmc/music/tags/TagLoaderTagLib.h
@@ -20,7 +20,6 @@
  *
  */
 
-#undef byte
 #include <taglib/aifffile.h>
 #include <taglib/apefile.h>
 #include <taglib/asffile.h>