summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
author Oliver Stöneberg <firewave@users.noreply.github.com>2013-01-01 20:41:17 +0000
committer Oliver Stöneberg <firewave@users.noreply.github.com>2013-01-01 20:41:17 +0000
commit747289faf7a089305df0b7cb07a7fc0437c6d574 (patch)
treebd2580eb91db7334aa63a014db14c2d2f28c9625 /src/lib
parent6034e2bceb42f7d9926d31abe3dceaaf512e15a8 (diff)
fixed portmidi Visual Studio warnings (nw)
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/portmidi/pmutil.c2
-rw-r--r--src/lib/portmidi/pmwinmm.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/portmidi/pmutil.c b/src/lib/portmidi/pmutil.c
index a70fe2fa1f8..7d0abe35337 100644
--- a/src/lib/portmidi/pmutil.c
+++ b/src/lib/portmidi/pmutil.c
@@ -8,7 +8,7 @@
#include "pmutil.h"
#include "pminternal.h"
-#ifdef WIN32
+#if defined(WIN32) || defined(_MSC_VER)
#define bzero(addr, siz) memset(addr, 0, siz)
#endif
diff --git a/src/lib/portmidi/pmwinmm.c b/src/lib/portmidi/pmwinmm.c
index 5303ed4c4dd..9921b1af8e6 100644
--- a/src/lib/portmidi/pmwinmm.c
+++ b/src/lib/portmidi/pmwinmm.c
@@ -207,7 +207,7 @@ static void pm_winmm_mapper_input(void)
sizeof(MIDIINCAPS));
if (wRtn == MMSYSERR_NOERROR) {
pm_add_device((char *)"MMSystem", midi_in_mapper_caps.szPname, TRUE,
- (void *) MIDIMAPPER, &pm_winmm_in_dictionary);
+ (void *)(FPTR)MIDIMAPPER, &pm_winmm_in_dictionary);
}
}
@@ -246,7 +246,7 @@ static void pm_winmm_mapper_output(void)
& midi_out_mapper_caps, sizeof(MIDIOUTCAPS));
if (wRtn == MMSYSERR_NOERROR) {
pm_add_device((char *)"MMSystem", midi_out_mapper_caps.szPname, FALSE,
- (void *) MIDIMAPPER, &pm_winmm_out_dictionary);
+ (void *)(FPTR)MIDIMAPPER, &pm_winmm_out_dictionary);
}
}