Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid potential header clash between DirectX' and lilypad's xinput.h #786

Merged
merged 1 commit into from Aug 22, 2015

Conversation

Projects
None yet
2 participants
@Pistachioman
Copy link
Contributor

commented Aug 21, 2015

Lilypad has a header called xinput.h but also uses the xinput.h from the DirectX SDK. This could result in including the wrong header by accident and the compilation failing. This is not a problem right now, but might become one when changing something in the build system. I renamed the cpp file too for consistency's sake.

micove added a commit that referenced this pull request Aug 22, 2015

Merge pull request #786 from Pistachioman/lilyxinput
Avoid potential header clash between DirectX' and lilypad's xinput.h

@micove micove merged commit 8223b09 into PCSX2:master Aug 22, 2015

@micove

This comment has been minimized.

Copy link
Contributor

commented Aug 22, 2015

Looks fine. Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.