fix a naming conflict

diff --git a/sound/windsound/windsound.c b/sound/windsound/windsound.c
index ed4a7f9960097ca4b9f42edd2d66312f4032e72f..576a38007e37c23df97e92d819590c8f8b1b3c6b 100644 (file)
--- a/sound/windsound/windsound.c
+++ b/sound/windsound/windsound.c
@@ -67,10 +67,10 @@ windsound_soundeffect(char *desc, int32_t seid, int32_t volume)
         * API PlaySound function with the SND_RESOURCE flag. Use files from
         * the file system instead. */
         extern char *sounddir;   /* in sounds.c, set in files.c */
-        char *exedir;
+        char *mingw_exedir;
 
        if (!sounddir) {
-           exedir = exepath();
+           exedir = mingw_exepath();
             if (exedir)
                 if (strlen(exedir) < sizeof buf - 30) {
                     Strcpy(buf, exedir);

diff --git a/sys/windows/windmain.c b/sys/windows/windmain.c
index 7c89037d030ca6a97ca600b812f9c21306352d9e..1b1e3b76bc158fc9b05c0c521a9082c2532f0b35 100644 (file)
--- a/sys/windows/windmain.c
+++ b/sys/windows/windmain.c
@@ -1085,7 +1085,7 @@ get_executable_path(void)
 
 #ifdef __MINGW32__
 char *
-exepath(void)
+mingw_exepath(void)
 {
     char *p = (char *) 0;