Evas: Don't #define _GNU_SOURCE

Instead use AC_GNU_SOURCE macro in configure.ac and #include <config.h> properly SVN revision: 53159
2010-10-07 19:52:47 +00:00 · 2010-10-07 19:52:47 +00:00 · f61a1cb5cb
parent a5a3fc18e5
commit f61a1cb5cb
11 changed files with 7 additions and 39 deletions
--- a/legacy/evas/configure.ac
+++ b/legacy/evas/configure.ac
@ -38,6 +38,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
+AC_GNU_SOURCE

 AM_INIT_AUTOMAKE([1.6 dist-bzip2])
 AM_CONFIG_HEADER([config.h])
@ -79,11 +80,6 @@ esac
 AC_SUBST(MODULE_ARCH)
 AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")

-# weird debian etch bug where pthread_barrier doesn't work without adding
-# this.
-CFLAGS="${CFLAGS=} -D_GNU_SOURCE"
-AC_SUBST(CFLAGS)
-
 want_fontconfig="auto"
 want_fribidi="auto"
 want_evas_cserve="yes"
--- a/legacy/evas/src/lib/file/evas_module.c
+++ b/legacy/evas/src/lib/file/evas_module.c
@ -1,5 +1,5 @@
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
+#ifdef HAVE_CONFIG_H
+# include <config.h>
 #endif

 #include <string.h>
--- a/legacy/evas/src/lib/include/evas_common.h
+++ b/legacy/evas/src/lib/include/evas_common.h
@ -113,10 +113,6 @@ extern EAPI int _evas_log_dom_global;
 # define __ARM_ARCH__ 73
 #endif

-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
-
 #ifndef BUILD_PTHREAD
 # undef BUILD_PIPE_RENDER
 #endif
--- a/legacy/evas/src/lib/include/evas_options.h
+++ b/legacy/evas/src/lib/include/evas_options.h
@ -61,10 +61,6 @@
 # endif
 #endif

-#ifdef BUILD_FMEMOPEN
-# define _GNU_SOURCE
-#endif
-
 #define DIRECT_SCALE

 #endif
--- a/legacy/evas/src/lib/include/evas_private.h
+++ b/legacy/evas/src/lib/include/evas_private.h
@ -1,10 +1,6 @@
 #ifndef EVAS_PRIVATE_H
 #define EVAS_PRIVATE_H

-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
--- a/legacy/evas/src/modules/engines/software_x11/evas_xlib_outbuf.c
+++ b/legacy/evas/src/modules/engines/software_x11/evas_xlib_outbuf.c
@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <sys/time.h>
 #include <sys/utsname.h>

--- a/legacy/evas/src/modules/loaders/bmp/evas_image_load_bmp.c
+++ b/legacy/evas/src/modules/loaders/bmp/evas_image_load_bmp.c
@ -2,10 +2,6 @@
 # include <config.h>
 #endif

-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
 #include <stdio.h>

 #ifdef HAVE_EVIL
--- a/legacy/evas/src/modules/loaders/pmaps/evas_image_load_pmaps.c
+++ b/legacy/evas/src/modules/loaders/pmaps/evas_image_load_pmaps.c
@ -2,10 +2,6 @@
 # include <config.h>
 #endif

-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
 #ifdef HAVE_EVIL
 # include <Evil.h>
 #endif
--- a/legacy/evas/src/modules/loaders/png/evas_image_load_png.c
+++ b/legacy/evas/src/modules/loaders/png/evas_image_load_png.c
@ -2,10 +2,6 @@
 # include <config.h>
 #endif

-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
 #include <stdio.h>
 #include <png.h>
 #include <setjmp.h>
--- a/legacy/evas/src/modules/loaders/tga/evas_image_load_tga.c
+++ b/legacy/evas/src/modules/loaders/tga/evas_image_load_tga.c
@ -2,10 +2,6 @@
 # include <config.h>
 #endif

-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
 #include <stdio.h>
 #include <sys/types.h>
 #include <fcntl.h>
--- a/legacy/evas/src/modules/savers/png/evas_image_save_png.c
+++ b/legacy/evas/src/modules/savers/png/evas_image_save_png.c
@ -2,10 +2,6 @@
 # include <config.h>
 #endif

-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
 #include <stdio.h>
 #include <png.h>
 #include <setjmp.h>