[Libreoffice-commits] core.git: 2 commits - configure.ac desktop/unx

[Michael Stahl]

 configure.ac                        |   12 ++++++------
 desktop/unx/source/file_image_unx.c |    6 ------
 2 files changed, 6 insertions(+), 12 deletions(-)

New commits:
commit da4a5fa517a7379da84bf7d514eafe2c721246d3
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Oct 9 21:04:15 2014 +0200

    configure: let's default to GStreamer 1.0
    
    Support was added 2 years ago, it is probably more likely to be
    installed than 0.10 now.
    
    Change-Id: Ia2e36725f50f96889eb602468840dde9259c2b90

diff --git a/configure.ac b/configure.ac
index 7da6486..e5e6143 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1208,14 +1208,14 @@ AC_ARG_ENABLE(randr-link,
 ,enable_randr_link=yes)
 
 AC_ARG_ENABLE(gstreamer,
-    AS_HELP_STRING([--enable-gstreamer],
-        [Enable building with the new gstreamer 1.0 avmedia backend.]),
-,enable_gstreamer=no)
+    AS_HELP_STRING([--disable-gstreamer],
+        [Disable building with the new gstreamer 1.0 avmedia backend.]),
+,enable_gstreamer=yes)
 
 AC_ARG_ENABLE(gstreamer-0-10,
-    AS_HELP_STRING([--disable-gstreamer-0-10],
-        [Disable building the gstreamer avmedia backend.]),
-,enable_gstreamer_0_10=yes)
+    AS_HELP_STRING([--enable-gstreamer-0-10],
+        [Enable building the gstreamer 0.10 avmedia backend.]),
+,enable_gstreamer_0_10=no)
 
 AC_ARG_ENABLE(vlc,
     AS_HELP_STRING([--enable-vlc],
commit 2e69b60cc2abb8e0a6773e101c03050c57a12ca3
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Oct 9 20:41:11 2014 +0200

    desktop: -Werror=unused-macros
    
    The documented feature test macro is _BSD_SOURCE, and anyway, feature
    test macros must be defined before the first libc header is included, so
    this one is evidently useless.
    
    Change-Id: Ib4b2db0c6151c2f3df322992b189257f5dd0ea22

diff --git a/desktop/unx/source/file_image_unx.c b/desktop/unx/source/file_image_unx.c
index 89df91e..f1320cc 100644
--- a/desktop/unx/source/file_image_unx.c
+++ b/desktop/unx/source/file_image_unx.c
@@ -24,12 +24,6 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#if defined(LINUX)
-#  ifndef __USE_BSD
-#    define __USE_BSD /* madvise, MADV_WILLNEED */
-#  endif
-#endif /* Linux */
-
 #include <sys/mman.h>
 #include <sys/stat.h>