From: Jan Safranek <jsafrane@redhat.com>
Date: Mon, 8 Mar 2010 11:45:57 +0000 (+0100)
Subject: Remove GNU_SOURCE from public headers
X-Git-Tag: v0.36.2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=794b7a1c93515115359682ba2f7c6ecb1ca7586a;p=thirdparty%2Flibcgroup.git

Remove GNU_SOURCE from public headers

Remove GNU_SOURCE from public headers, it has unpredictable consequences on
applications using libcgroup.h

Signed-off-by: Jan Safranek <jsafrane@redhat.com>
Signed-off-by: Dhaval Giani <dhaval.giani@gmail.com>
---

diff --git a/include/libcgroup.h b/include/libcgroup.h
index c8f12407..8a24bf74 100644
--- a/include/libcgroup.h
+++ b/include/libcgroup.h
@@ -26,14 +26,6 @@ __BEGIN_DECLS
 #include <sys/types.h>
 #include <linux/cn_proc.h>
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#ifndef __USE_GNU
-#define __USE_GNU
-#endif
-
 /* Maximum number of mount points/controllers */
 #define MAX_MNT_ELEMENTS	8
 /* Estimated number of groups created */
diff --git a/src/tools/cgconfig.c b/src/tools/cgconfig.c
index cc33ad9f..e426b760 100644
--- a/src/tools/cgconfig.c
+++ b/src/tools/cgconfig.c
@@ -19,9 +19,16 @@
 
 #include <libcgroup.h>
 #include <libcgroup-internal.h>
+
+/* For basename() */
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include <string.h>
+#include <libgen.h>
+
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <errno.h>
 #include <getopt.h>