Skip to content

Commit

Permalink
VstPlugin: Fix define naming conflict with MinGW
Browse files Browse the repository at this point in the history
  • Loading branch information
lukas-w committed Jun 11, 2018
1 parent 0349b97 commit af57300
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions plugins/vst_base/VstPlugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ namespace PE
// Utilities for reading PE file machine type
// See specification at https://msdn.microsoft.com/library/windows/desktop/ms680547(v=vs.85).aspx

// Work around name conflict
#ifdef i386
# undef i386

This comment has been minimized.

Copy link
@PhysSong

PhysSong Jun 16, 2018

Member

Do you have any other way? It looks safe, but I think you may fix the conflict without touching this.

This comment has been minimized.

Copy link
@lukas-w

lukas-w Jun 16, 2018

Author Member

I don't see what's wrong with this solution so I'm not sure what you're suggesting. If there's a potential problem here, I'm open for suggestions. :)

By the way, the name conflicts only exists for certain versions of MinGW and only when compiling for 32bit, so I'd say it's too uncommon to justify renaming the enum member.

#endif

enum class MachineType : uint16_t
{
unknown = 0x0,
Expand Down

0 comments on commit af57300

Please sign in to comment.