[openoffice] 04/07: Some more Initial support for the FreeBSD ARM platform.

[tr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

truckman pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 08797115ce0f707eb70a34fa2507134d1bb690a5
Author: pfg <pf...@13f79535-47bb-0310-9956-ffa450edef68>
AuthorDate: Tue Jan 3 05:32:49 2017 +0000

    Some more Initial support for the FreeBSD ARM platform.
    
    Minor adjustments; still untested.
    
    
    git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1777067 13f79535-47bb-0310-9956-ffa450edef68
---
 main/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk | 2 +-
 main/bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx | 2 +-
 main/desktop/source/deployment/misc/dp_platform.cxx      | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk
index 1672cdf..39df3a4 100644
--- a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk
+++ b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk
@@ -35,7 +35,7 @@ NO_BSYMBOLIC=TRUE
 
 # --- Files --------------------------------------------------------
 
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXRgcc3"
+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDRgcc3"
 
 .IF "$(cppu_no_leak)" == ""
 CFLAGS += -DLEAK_STATIC_DATA
diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx
index daf14dc..d5ab980 100644
--- a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx
@@ -21,7 +21,7 @@
 
 
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <rtl/alloc.h>
 
 #include <com/sun/star/uno/genfunc.hxx>
diff --git a/main/desktop/source/deployment/misc/dp_platform.cxx b/main/desktop/source/deployment/misc/dp_platform.cxx
index 5fee74d..2c40fbe 100644
--- a/main/desktop/source/deployment/misc/dp_platform.cxx
+++ b/main/desktop/source/deployment/misc/dp_platform.cxx
@@ -56,6 +56,7 @@
 #define PLATFORM_SOLARIS_SPARC      "solaris_sparc"
 #define PLATFORM_SOLARIS_SPARC64    "solaris_sparc64"
 #define PLATFORM_SOLARIS_X86        "solaris_x86"
+#define PLATFORM_FREEBSD_ARM        "freebsd_arm"
 #define PLATFORM_FREEBSD_POWERPC    "freebsd_powerpc"
 #define PLATFORM_FREEBSD_POWERPC64  "freebsd_powerpc64"
 #define PLATFORM_FREEBSD_X86        "freebsd_x86"