Skip to content

Commit

Permalink
Merge branch '257-wdmks-winioctl-include' into 'master'
Browse files Browse the repository at this point in the history
Fix for ticket #257: MinGW-w64: Inclusion of <winioctl.h> triggers multiple redefinition errors.

+1: Phil Burk

Merged-on: https://assembla.com/code/portaudio/git/merge_requests/3915493
  • Loading branch information
RossBencina committed Oct 4, 2016
2 parents 82773fe + 18b2ab2 commit 037f18a
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/hostapi/wdmks/pa_win_wdmks.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@ of a device for the duration of active stream using those devices
#endif

#include <windows.h>
#ifndef __GNUC__ /* Fix for ticket #257: MinGW-w64: Inclusion of <winioctl.h> triggers multiple redefinition errors. */
#include <winioctl.h>
#endif
#include <process.h>

#include <math.h>
Expand Down

0 comments on commit 037f18a

Please sign in to comment.