diff options
author | 2015-07-20 08:11:41 +0200 | |
---|---|---|
committer | 2015-07-20 08:11:41 +0200 | |
commit | 4bcb0c13f50ddb1cd3fd0341b4bb31d9c3c7fc7a (patch) | |
tree | 55eccacfca0e69435d0d4e6615205310ca11f271 /src/osd/modules/midi/portmidi.c | |
parent | d132946c6f45aa8d271c6180e86f72dd08243048 (diff) | |
parent | 229785f695b26c702c8490792611f59d0366a933 (diff) |
Merge pull request #5 from mamedev/master
Sync to base master
Diffstat (limited to 'src/osd/modules/midi/portmidi.c')
-rw-r--r-- | src/osd/modules/midi/portmidi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/osd/modules/midi/portmidi.c b/src/osd/modules/midi/portmidi.c index 78ac990d2b0..02dad28ffc1 100644 --- a/src/osd/modules/midi/portmidi.c +++ b/src/osd/modules/midi/portmidi.c @@ -10,7 +10,11 @@ #ifndef NO_USE_MIDI +#ifndef USE_SYSTEM_PORTMIDI #include "portmidi/pm_common/portmidi.h" +#else +#include <portmidi.h> +#endif #include "osdcore.h" #include "corealloc.h" #include "modules/osdmodule.h" |