[Libreoffice-commits] core.git: 2 commits - crashrep/source libxml2/ExternalProject_xml2.mk

[David Tardon]

 crashrep/source/unx/main.cxx    |    2 +-
 libxml2/ExternalProject_xml2.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f35e38e3a95275ed86f5b777870d1614ec99bda0
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Sep 15 09:59:51 2013 +0200

    libxml2 is URE lib
    
    Change-Id: I0ad5fa107c367fe929f0f0d17c611e80920a7665

diff --git a/libxml2/ExternalProject_xml2.mk b/libxml2/ExternalProject_xml2.mk
index d518a7f..a2d613d 100644
--- a/libxml2/ExternalProject_xml2.mk
+++ b/libxml2/ExternalProject_xml2.mk
@@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
 		./configure --disable-ipv6 --without-python --without-zlib --with-sax1 \
 			$(if $(debug),--with-run-debug) \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB) \
 			LDFLAGS="$(if $(SYSBASE),-L$(SYSBASE)/usr/lib)" \
 			CFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include) $(if $(debug),-g)" \
 			$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
commit 1dc085e42585c7b4fd0024cad64974d4d559fb00
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Sep 15 09:19:01 2013 +0200

    fix thinko
    
    Change-Id: I258d0d43e8a96c8295ec0b34fd4431b172947a27

diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
index 5bef30d..6dc8e19 100644
--- a/crashrep/source/unx/main.cxx
+++ b/crashrep/source/unx/main.cxx
@@ -34,7 +34,7 @@
 #include <vector>
 #include <string>
 
-#if defined (LINUX) || (FREEBSD)
+#if defined (LINUX) || defined (FREEBSD)
 #include <netinet/in.h>
 #endif