Commit cb5e4ff8 authored by Sam Lantinga's avatar Sam Lantinga

patch-pulse (from ahoka@NetBSD.org):

Fix assertion triggered in pulsaudio by returning "unknown" instead
of NULL pointer when guessing application name.

- Use getprogname on NetBSD as it wont return NULL

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%404096
parent 242f11f7
...@@ -346,8 +346,8 @@ static void PULSE_CloseAudio(_THIS) ...@@ -346,8 +346,8 @@ static void PULSE_CloseAudio(_THIS)
/* Try to get the name of the program */ /* Try to get the name of the program */
static char *get_progname(void) static char *get_progname(void)
{ {
char *progname = NULL;
#ifdef __LINUX__ #ifdef __LINUX__
char *progname = NULL;
FILE *fp; FILE *fp;
static char temp[BUFSIZ]; static char temp[BUFSIZ];
...@@ -364,8 +364,12 @@ static char *get_progname(void) ...@@ -364,8 +364,12 @@ static char *get_progname(void)
} }
fclose(fp); fclose(fp);
} }
#endif
return(progname); return(progname);
#elif defined(__NetBSD__)
return getprogname();
#else
return("unknown");
#endif
} }
static void stream_drain_complete(pa_stream *s, int success, void *userdata) { static void stream_drain_complete(pa_stream *s, int success, void *userdata) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment