From 47b978653358e3cde5eb1432efd5eb05a096f83c Mon Sep 17 00:00:00 2001
From: Sami Kerola <kerolasa@iki.fi>
Date: Tue, 12 Feb 2013 22:13:45 +0000
Subject: build-sys: use AC_USE_SYSTEM_EXTENSIONS

The earlier _GNU_SOURCE definitions possibly did not take effect
everywhere where it was intended.
---
 configure.ac                   | 1 +
 src/ClientPattern.cc           | 5 -----
 src/FbTk/Font.cc               | 4 ----
 src/FbTk/I18n.cc               | 5 -----
 src/FbTk/ImageControl.cc       | 5 -----
 src/FbTk/Menu.cc               | 5 -----
 src/FbTk/RegExp.cc             | 5 -----
 src/FbTk/Timer.cc              | 5 -----
 src/FbTk/XmbFontImp.cc         | 4 ----
 src/Remember.cc                | 5 -----
 src/Screen.cc                  | 5 -----
 src/Slit.cc                    | 5 -----
 src/Toolbar.cc                 | 5 -----
 src/Window.cc                  | 5 -----
 src/Workspace.cc               | 5 -----
 src/fluxbox.cc                 | 5 -----
 src/main.cc                    | 5 -----
 src/tests/Resourcetest.cc      | 5 -----
 src/tests/StringUtiltest.cc    | 3 ---
 util/fluxbox-update_configs.cc | 5 -----
 20 files changed, 1 insertion(+), 91 deletions(-)

diff --git a/configure.ac b/configure.ac
index da04054..e7b34ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ AC_INIT([fluxbox],
 	[fluxbox-devel@lists.sourceforge.net],,
 	[http://fluxbox.org/])
 AC_CONFIG_SRCDIR([src/fluxbox.cc])
+AC_USE_SYSTEM_EXTENSIONS
 AM_INIT_AUTOMAKE([foreign 1.10 tar-pax dist-bzip2 subdir-objects])
 
 dnl Determine default prefix
diff --git a/src/ClientPattern.cc b/src/ClientPattern.cc
index f57513d..696e70e 100644
--- a/src/ClientPattern.cc
+++ b/src/ClientPattern.cc
@@ -34,11 +34,6 @@
 #include "FbTk/stringstream.hh"
 #include "FbTk/STLUtil.hh"
 
-// use GNU extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include <fstream>
 #include <string>
 #include <memory>
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc
index 5987134..46a6b46 100644
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@@ -39,10 +39,6 @@
 #include "XFontImp.hh"
 
 #include "GContext.hh"
-//use gnu extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif //_GNU_SOURCE
 
 #ifndef __USE_GNU
 #define __USE_GNU
diff --git a/src/FbTk/I18n.cc b/src/FbTk/I18n.cc
index 3daa2e9..a7ed338 100644
--- a/src/FbTk/I18n.cc
+++ b/src/FbTk/I18n.cc
@@ -30,11 +30,6 @@
  * http://www.kulichki.com/moshkow/CYRILLIC/locale-tutorial-0_8.txt
  */
 
-//use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include "I18n.hh"
 #include "FileUtil.hh"
 
diff --git a/src/FbTk/ImageControl.cc b/src/FbTk/ImageControl.cc
index 8b5f23d..0693150 100644
--- a/src/FbTk/ImageControl.cc
+++ b/src/FbTk/ImageControl.cc
@@ -30,11 +30,6 @@
 #include "SimpleCommand.hh"
 #include "I18n.hh"
 
-//use GNU extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif // HAVE_SYS_TYPES_H
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 3e3481f..cb58685 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -22,11 +22,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include "Menu.hh"
 
 #include "MenuItem.hh"
diff --git a/src/FbTk/RegExp.cc b/src/FbTk/RegExp.cc
index 3467971..b358eeb 100644
--- a/src/FbTk/RegExp.cc
+++ b/src/FbTk/RegExp.cc
@@ -22,11 +22,6 @@
 
 #include "RegExp.hh"
 
-//use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include <iostream>
 
 using std::string;
diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc
index 7f7977e..1806557 100644
--- a/src/FbTk/Timer.cc
+++ b/src/FbTk/Timer.cc
@@ -27,11 +27,6 @@
 #include "CommandParser.hh"
 #include "StringUtil.hh"
 
-//use GNU extensions
-#ifndef	_GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #ifdef HAVE_CASSERT
   #include <cassert>
 #else
diff --git a/src/FbTk/XmbFontImp.cc b/src/FbTk/XmbFontImp.cc
index 6370d86..e73670c 100644
--- a/src/FbTk/XmbFontImp.cc
+++ b/src/FbTk/XmbFontImp.cc
@@ -31,10 +31,6 @@
 #include <locale.h>
 #endif // HAVE_SETLOCALE
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #ifdef HAVE_CSTDIO
   #include <cstdio>
 #else
diff --git a/src/Remember.cc b/src/Remember.cc
index 9b1233e..3ca8fcf 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -49,11 +49,6 @@
   #include <string.h>
 #endif
 
-//use GNU extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include <set>
 
 
diff --git a/src/Screen.cc b/src/Screen.cc
index 9bf8e40..05d274a 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -77,11 +77,6 @@
 #include "FbTk/KeyUtil.hh"
 #include "FbTk/Util.hh"
 
-//use GNU extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #ifdef USE_SLIT
 #include "Slit.hh"
 #include "SlitClient.hh"
diff --git a/src/Slit.cc b/src/Slit.cc
index 47cd11f..9eaa439 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -24,11 +24,6 @@
 
 #include "Slit.hh"
 
-//use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include "Screen.hh"
 #include "ScreenPlacement.hh"
 #include "FbTk/ImageControl.hh"
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 775bf39..c65e9ca 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -55,11 +55,6 @@
 #include "FbTk/STLUtil.hh"
 #include "FbTk/Util.hh"
 
-// use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
diff --git a/src/Window.cc b/src/Window.cc
index 4c81124..98199c7 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -59,11 +59,6 @@
 #include <X11/extensions/shape.h>
 #endif // SHAPE
 
-//use GNU extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 
diff --git a/src/Workspace.cc b/src/Workspace.cc
index 6a721cb..bf2aea3 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -36,11 +36,6 @@
 #include "FbTk/FbString.hh"
 #include "FbTk/MemFun.hh"
 
-// use GNU extensions
-#ifndef  _GNU_SOURCE
-#define  _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index cec46eb..015bb62 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -57,11 +57,6 @@
 #include "FbTk/KeyUtil.hh"
 #include "FbTk/MemFun.hh"
 
-//Use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #ifdef USE_EWMH
 #include "Ewmh.hh"
 #endif // USE_EWMH
diff --git a/src/main.cc b/src/main.cc
index bcd31db..03eea04 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -32,11 +32,6 @@
 #include "FbTk/FileUtil.hh"
 #include "FbTk/StringUtil.hh"
 
-//use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #ifdef HAVE_CSTDLIB
   #include <cstdlib>
 #else
diff --git a/src/tests/Resourcetest.cc b/src/tests/Resourcetest.cc
index 53b5ec4..a1df8d9 100644
--- a/src/tests/Resourcetest.cc
+++ b/src/tests/Resourcetest.cc
@@ -21,11 +21,6 @@
 
 #include "Resource.hh"
 
-//use of strcasecmp 
-#ifndef   _GNU_SOURCE
-#define   _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include <string>
 #include <iostream>
 #ifdef HAVE_CSTDIO
diff --git a/src/tests/StringUtiltest.cc b/src/tests/StringUtiltest.cc
index e5e8419..05bfde9 100644
--- a/src/tests/StringUtiltest.cc
+++ b/src/tests/StringUtiltest.cc
@@ -20,9 +20,6 @@
 // DEALINGS IN THE SOFTWARE.
 
 #include "FbTk/StringUtil.hh"
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif //_GNU_SOURCE
 
 #include <cstring>
 #include <cstdlib>
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index a4fe6f2..b93f344 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -30,11 +30,6 @@
 #include <signal.h>
 #endif // HAVE_SIGNAL_H
 
-//use GNU extensions
-#ifndef         _GNU_SOURCE
-#define         _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #ifdef HAVE_CSTRING
   #include <cstring>
 #else
-- 
cgit v0.11.2