Merge branch 'master' into devel

Conflicts:
	Makefile.am

1 files changed, 2 insertions, 0 deletions

diff --git a/main.c b/main.c
index ab2b0a13..7d7a2d05 100644
--- a/main.c
+++ b/main.c
@@ -396,7 +396,9 @@ sigterm_handler (int sig) {
 int
 main (int argc, char *argv[]) {
     srand (time (NULL));
+#ifdef __linux__
     prctl (PR_SET_NAME, "deadbeef-main", 0, 0, 0, 0);
+#endif
     char *homedir = getenv ("HOME");
     if (!homedir) {
         fprintf (stderr, "unable to find home directory. stopping.\n");