From: nhmall Date: Tue, 31 Jan 2023 06:10:02 +0000 (-0500) Subject: fix a naming conflict X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c5bbdc0ed0051b330d298092824e9d3cc2659fb;p=nethack fix a naming conflict --- diff --git a/sound/windsound/windsound.c b/sound/windsound/windsound.c index ed4a7f996..576a38007 100644 --- 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 7c89037d0..1b1e3b76b 100644 --- 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;