Skip to content

Commit

Permalink
remove undef of byte workarounds now that we don't define it in Platf…
Browse files Browse the repository at this point in the history
…ormDefs.h
  • Loading branch information
Jonathan Marshall committed May 11, 2013
1 parent 558fe06 commit 644fe20
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 6 deletions.
2 changes: 0 additions & 2 deletions lib/UnrarXLib/rartypes.hpp
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 0 additions & 2 deletions xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibMad.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion xbmc/music/tags/TagLoaderTagLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#include <taglib/unsynchronizedlyricsframe.h>
#include <taglib/attachedpictureframe.h>

#undef byte
#include <taglib/tstring.h>
#include <taglib/tpropertymap.h>

Expand Down
1 change: 0 additions & 1 deletion xbmc/music/tags/TagLoaderTagLib.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
*
*/

#undef byte
#include <taglib/aifffile.h>
#include <taglib/apefile.h>
#include <taglib/asffile.h>
Expand Down

0 comments on commit 644fe20

Please sign in to comment.