GNOME.org
 

[rhythmbox] stop defining _XOPEN_SOURCE as it breaks glib sometimes

commit e66d4d374dae1a69f8efa71de490cded9033fe11
Author: Jonathan Matthew <jonathan d14n org>
Date:   Thu Sep 29 09:23:56 2011 +1000

    stop defining _XOPEN_SOURCE as it breaks glib sometimes

 plugins/audiocd/Makefile.am               |    2 +-
 plugins/audioscrobbler/Makefile.am        |    2 +-
 plugins/brasero-disc-recorder/Makefile.am |    2 +-
 plugins/daap/Makefile.am                  |    2 +-
 plugins/dbus-media-server/Makefile.am     |    2 +-
 plugins/fmradio/Makefile.am               |    2 +-
 plugins/generic-player/Makefile.am        |    2 +-
 plugins/grilo/Makefile.am                 |    2 +-
 plugins/ipod/Makefile.am                  |    2 +-
 plugins/iradio/Makefile.am                |    2 +-
 plugins/lirc/Makefile.am                  |    2 +-
 plugins/mmkeys/Makefile.am                |    2 +-
 plugins/mpris/Makefile.am                 |    2 +-
 plugins/mtpdevice/Makefile.am             |    2 +-
 plugins/notification/Makefile.am          |    2 +-
 plugins/power-manager/Makefile.am         |    2 +-
 plugins/sample-vala/Makefile.am           |    2 +-
 plugins/sample/Makefile.am                |    2 +-
 plugins/visualizer/Makefile.am            |    2 +-
 shell/Makefile.am                         |    3 ++-
 tests/Makefile.am                         |    2 +-
 21 files changed, 22 insertions(+), 21 deletions(-)
---
diff --git a/plugins/audiocd/Makefile.am b/plugins/audiocd/Makefile.am
index f0a1609..d9475f4 100644
--- a/plugins/audiocd/Makefile.am
+++ b/plugins/audiocd/Makefile.am
@@ -40,7 +40,7 @@ INCLUDES = 						\
 	$(RHYTHMBOX_CFLAGS)				\
 	$(GSTCDDA_CFLAGS)				\
 	-DUSE_TOTEM_PL_PARSER				\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE
+	-D_BSD_SOURCE
 
 if HAVE_MUSICBRAINZ3
 libaudiocd_la_LIBADD +=$(MUSICBRAINZ3_LIBS)
diff --git a/plugins/audioscrobbler/Makefile.am b/plugins/audioscrobbler/Makefile.am
index e9d611b..216f8dd 100644
--- a/plugins/audioscrobbler/Makefile.am
+++ b/plugins/audioscrobbler/Makefile.am
@@ -54,7 +54,7 @@ INCLUDES = 						\
 	$(JSON_GLIB_CFLAGS)				\
 	$(RHYTHMBOX_CFLAGS)				\
 	$(GNOME_KEYRING_CFLAGS)				\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE
+	-D_BSD_SOURCE
 
 gtkbuilderdir = $(plugindatadir)
 gtkbuilder_DATA =					\
diff --git a/plugins/brasero-disc-recorder/Makefile.am b/plugins/brasero-disc-recorder/Makefile.am
index 88bd0dc..678b1c5 100644
--- a/plugins/brasero-disc-recorder/Makefile.am
+++ b/plugins/brasero-disc-recorder/Makefile.am
@@ -30,7 +30,7 @@ INCLUDES = 						\
 	-DDATADIR=\""$(datadir)"\"			\
 	$(RHYTHMBOX_CFLAGS)				\
 	$(LIBBRASERO_MEDIA_CFLAGS)			\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE			\
+	-D_BSD_SOURCE			\
 	$(NULL)
 
 plugin_in_files = cd-recorder.plugin.in
diff --git a/plugins/daap/Makefile.am b/plugins/daap/Makefile.am
index 2bd4704..a720961 100644
--- a/plugins/daap/Makefile.am
+++ b/plugins/daap/Makefile.am
@@ -63,7 +63,7 @@ INCLUDES = 						\
 	-DDATADIR=\""$(datadir)"\"			\
 	$(DMAPSHARING_CFLAGS)				\
 	$(RHYTHMBOX_CFLAGS)				\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE
+	-D_BSD_SOURCE
 
 if USE_GNOME_KEYRING
 libdaap_la_LIBADD += $(GNOME_KEYRING_LIBS)
diff --git a/plugins/dbus-media-server/Makefile.am b/plugins/dbus-media-server/Makefile.am
index 488ee0e..3364ed6 100644
--- a/plugins/dbus-media-server/Makefile.am
+++ b/plugins/dbus-media-server/Makefile.am
@@ -24,7 +24,7 @@ INCLUDES = 						\
 	-DSHARE_DIR=\"$(pkgdatadir)\"                   \
 	-DDATADIR=\""$(datadir)"\"			\
 	$(RHYTHMBOX_CFLAGS)				\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE			\
+	-D_BSD_SOURCE			\
 	$(NULL)
 
 plugin_in_files = dbus-media-server.plugin.in
diff --git a/plugins/fmradio/Makefile.am b/plugins/fmradio/Makefile.am
index 2e7d637..06a886c 100644
--- a/plugins/fmradio/Makefile.am
+++ b/plugins/fmradio/Makefile.am
@@ -33,7 +33,7 @@ INCLUDES = \
   $(RHYTHMBOX_CFLAGS) \
   $(TOTEM_PLPARSER_CFLAGS) \
   $(WARN_CFLAGS) \
-  -D_XOPEN_SOURCE -D_BSD_SOURCE
+  -D_BSD_SOURCE
 
 plugin_in_files = fmradio.plugin.in
 %.plugin: %.plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff --git a/plugins/generic-player/Makefile.am b/plugins/generic-player/Makefile.am
index 6426902..f6db0dc 100644
--- a/plugins/generic-player/Makefile.am
+++ b/plugins/generic-player/Makefile.am
@@ -38,7 +38,7 @@ INCLUDES = 						\
 	-DDATADIR=\""$(datadir)"\"			\
 	$(TOTEM_PLPARSER_CFLAGS)			\
 	$(RHYTHMBOX_CFLAGS)				\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE
+	-D_BSD_SOURCE
 
 uixmldir = $(plugindatadir)
 uixml_DATA = generic-player-ui.xml
diff --git a/plugins/grilo/Makefile.am b/plugins/grilo/Makefile.am
index cab8672..ca29c46 100644
--- a/plugins/grilo/Makefile.am
+++ b/plugins/grilo/Makefile.am
@@ -29,7 +29,7 @@ INCLUDES = 						\
 	-DDATADIR=\""$(datadir)"\"			\
 	$(RHYTHMBOX_CFLAGS)				\
 	$(GRILO_CFLAGS)					\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE
+	-D_BSD_SOURCE
 
 libgrilo_la_LIBADD += $(NULL)
 
diff --git a/plugins/ipod/Makefile.am b/plugins/ipod/Makefile.am
index c8e2c48..ff10ab9 100644
--- a/plugins/ipod/Makefile.am
+++ b/plugins/ipod/Makefile.am
@@ -38,7 +38,7 @@ INCLUDES = 						\
 	-DDATADIR=\""$(datadir)"\"			\
 	$(RHYTHMBOX_CFLAGS)				\
 	$(IPOD_CFLAGS)					\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE
+	-D_BSD_SOURCE
 
 plugin_in_files = ipod.plugin.in
 
diff --git a/plugins/iradio/Makefile.am b/plugins/iradio/Makefile.am
index 10dda8d..5185c9c 100644
--- a/plugins/iradio/Makefile.am
+++ b/plugins/iradio/Makefile.am
@@ -37,7 +37,7 @@ INCLUDES = 						\
 	-DDATADIR=\""$(datadir)"\"			\
 	$(RHYTHMBOX_CFLAGS)				\
 	$(TOTEM_PLPARSER_CFLAGS)			\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE
+	-D_BSD_SOURCE
 
 gtkbuilderdir = $(plugindatadir)
 gtkbuilder_DATA = \
diff --git a/plugins/lirc/Makefile.am b/plugins/lirc/Makefile.am
index 7c060cb..7f87007 100644
--- a/plugins/lirc/Makefile.am
+++ b/plugins/lirc/Makefile.am
@@ -28,7 +28,7 @@ INCLUDES = 						\
 	-DSHARE_DIR=\"$(pkgdatadir)\"                   \
 	-DDATADIR=\""$(datadir)"\"			\
 	$(RHYTHMBOX_CFLAGS)				\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE
+	-D_BSD_SOURCE
 
 plugin_in_files = lirc.plugin.in
 
diff --git a/plugins/mmkeys/Makefile.am b/plugins/mmkeys/Makefile.am
index cc77e07..c0102ae 100644
--- a/plugins/mmkeys/Makefile.am
+++ b/plugins/mmkeys/Makefile.am
@@ -30,7 +30,7 @@ INCLUDES = 						\
 	-DSHARE_DIR=\"$(pkgdatadir)\"                   \
 	-DDATADIR=\""$(datadir)"\"			\
 	$(RHYTHMBOX_CFLAGS)				\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE			\
+	-D_BSD_SOURCE			\
 	$(NULL)
 
 plugin_in_files = mmkeys.plugin.in
diff --git a/plugins/mpris/Makefile.am b/plugins/mpris/Makefile.am
index aedb97d..409df19 100644
--- a/plugins/mpris/Makefile.am
+++ b/plugins/mpris/Makefile.am
@@ -24,7 +24,7 @@ INCLUDES = 						\
 	-DSHARE_DIR=\"$(pkgdatadir)\"                   \
 	-DDATADIR=\""$(datadir)"\"			\
 	$(RHYTHMBOX_CFLAGS)				\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE			\
+	-D_BSD_SOURCE			\
 	$(NULL)
 
 plugin_in_files = mpris.plugin.in
diff --git a/plugins/mtpdevice/Makefile.am b/plugins/mtpdevice/Makefile.am
index b023000..534d243 100644
--- a/plugins/mtpdevice/Makefile.am
+++ b/plugins/mtpdevice/Makefile.am
@@ -43,7 +43,7 @@ INCLUDES = 						\
 	$(GUDEV_CFLAGS)					\
 	$(HAL_CFLAGS)					\
 	$(MTP_CFLAGS)					\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE
+	-D_BSD_SOURCE
 
 plugin_in_files = mtpdevice.plugin.in
 
diff --git a/plugins/notification/Makefile.am b/plugins/notification/Makefile.am
index 6b5ef7b..bba354d 100644
--- a/plugins/notification/Makefile.am
+++ b/plugins/notification/Makefile.am
@@ -30,7 +30,7 @@ INCLUDES = 						\
 	-DDATADIR=\""$(datadir)"\"			\
 	$(RHYTHMBOX_CFLAGS)				\
 	$(NOTIFY_CFLAGS)				\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE
+	-D_BSD_SOURCE
 
 plugin_in_files = notification.plugin.in
 
diff --git a/plugins/power-manager/Makefile.am b/plugins/power-manager/Makefile.am
index 103d7b7..f436e12 100644
--- a/plugins/power-manager/Makefile.am
+++ b/plugins/power-manager/Makefile.am
@@ -27,7 +27,7 @@ INCLUDES = 						\
 	-DSHARE_DIR=\"$(pkgdatadir)\"                   \
 	-DDATADIR=\""$(datadir)"\"			\
 	$(RHYTHMBOX_CFLAGS)				\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE
+	-D_BSD_SOURCE
 
 plugin_in_files = power-manager.plugin.in
 
diff --git a/plugins/sample-vala/Makefile.am b/plugins/sample-vala/Makefile.am
index 18bfaf5..4df57a3 100644
--- a/plugins/sample-vala/Makefile.am
+++ b/plugins/sample-vala/Makefile.am
@@ -30,7 +30,7 @@ INCLUDES = 						\
 	-DSHARE_DIR=\"$(pkgdatadir)\"                   \
 	-DDATADIR=\""$(datadir)"\"			\
 	$(RHYTHMBOX_CFLAGS)				\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE
+	-D_BSD_SOURCE
 
 
 plugin_in_files = sample-vala.plugin.in
diff --git a/plugins/sample/Makefile.am b/plugins/sample/Makefile.am
index bffd865..9181dab 100644
--- a/plugins/sample/Makefile.am
+++ b/plugins/sample/Makefile.am
@@ -25,7 +25,7 @@ INCLUDES = 						\
 	-DSHARE_DIR=\"$(pkgdatadir)\"                   \
 	-DDATADIR=\""$(datadir)"\"			\
 	$(RHYTHMBOX_CFLAGS)				\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE
+	-D_BSD_SOURCE
 
 plugin_in_files = sample.plugin.in
 
diff --git a/plugins/visualizer/Makefile.am b/plugins/visualizer/Makefile.am
index b000b81..4d70e8c 100644
--- a/plugins/visualizer/Makefile.am
+++ b/plugins/visualizer/Makefile.am
@@ -34,7 +34,7 @@ INCLUDES = 						\
 	-DPLUGIN_SRC_DIR=\""$(ROOT_UNINSTALLED_DIR)/plugins/visualizer"\" \
 	$(RHYTHMBOX_CFLAGS)				\
 	$(CLUTTER_CFLAGS)					\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE
+	-D_BSD_SOURCE
 
 mxthemedir = $(plugindatadir)
 mxtheme_DATA = 						\
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 631e739..a14c718 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -47,7 +47,8 @@ INCLUDES = 						\
 	$(DBUS_CFLAGS)					\
 	$(GUDEV_CFLAGS)					\
 	$(WEBKIT_FLAGS)				\
-	-D_XOPEN_SOURCE -D__EXTENSIONS__ -D_BSD_SOURCE
+	-D__EXTENSIONS__ -D_BSD_SOURCE
+
 
 shellincludedir = $(includedir)/rhythmbox/shell
 shellinclude_HEADERS =					\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bf7bc01..ee77cb1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -58,7 +58,7 @@ INCLUDES = 							\
 	-I$(top_srcdir)/rhythmdb				\
 	-I$(top_srcdir)/podcast					\
 	-I$(top_srcdir)/plugins/audioscrobbler			\
-	-D_XOPEN_SOURCE -D_BSD_SOURCE
+	-D_BSD_SOURCE
 
 if HAVE_CHECK
 TESTS += \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]