From 60de87151182fe4d7c5490e0d57637dc5c9dce40 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Sat, 3 Mar 2012 12:39:09 -0800
Subject: [PATCH] NSM: Clean up compiler warnings.

---
 session-manager/src/nsmd.C            | 2 ++
 session-manager/src/session-manager.C | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/session-manager/src/nsmd.C b/session-manager/src/nsmd.C
index c7c549c..520db63 100644
--- a/session-manager/src/nsmd.C
+++ b/session-manager/src/nsmd.C
@@ -21,7 +21,9 @@
 
 #include "debug.h"
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 
 #include <errno.h>
 #include <string.h>
diff --git a/session-manager/src/session-manager.C b/session-manager/src/session-manager.C
index 10e8ca5..775e616 100644
--- a/session-manager/src/session-manager.C
+++ b/session-manager/src/session-manager.C
@@ -475,7 +475,7 @@ public:
 
     const char *session_name ( void ) const
         {
-            clients_pack->parent()->label();
+            return clients_pack->parent()->label();
         }
 
     void
@@ -901,7 +901,7 @@ ping ( void * )
 }
 
 void
-cb_main ( Fl_Widget *o, void *v )
+cb_main ( Fl_Widget *, void * )
 {
     if ( Fl::event_key() != FL_Escape )
     {