ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #906 from lioncash/cruft 

DiscIO: Get rid of unnecessary struct differencing
This commit is contained in:
Ryan Houdek 2014-08-29 19:51:05 -05:00
parent af79d28cfa cee3362e33
commit b6cd099e2a
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/DiscIO/VolumeCreator.cpp
View File

@ -32,14 +32,6 @@ enum EDiscType
DISC_TYPE_WAD DISC_TYPE_WAD
}; };
#ifndef _WIN32
struct SPartition
{
u64 Offset;
u32 Type;
}; //gcc 4.3 cries if it's local
#endif
class CBlobBigEndianReader class CBlobBigEndianReader
{ {
public: public:
@ -155,13 +147,12 @@ static IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _Part
if ((int)_VolumeNum != -1 && _VolumeNum > numPartitions) if ((int)_VolumeNum != -1 && _VolumeNum > numPartitions)
return nullptr; return nullptr;
#ifdef _WIN32
struct SPartition struct SPartition
{ {
u64 Offset; u64 Offset;
u32 Type; u32 Type;
}; };
#endif
struct SPartitionGroup struct SPartitionGroup
{ {
u32 numPartitions; u32 numPartitions;