Kaydet (Commit) c75a5757 authored tarafından David Tardon's avatar David Tardon

WaE: macro "LT_HAVE_INLINE" is not used

Change-Id: I375449ac3068927f525881b0022721130c9c63d6
üst 591a22f4
#ifndef CONFIG_LIBLANGTAG_H
#define CONFIG_LIBLANGTAG_H
#undef LIBLANGTAG_INLINE_FIX
#endif
...@@ -11831,12 +11831,16 @@ if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os != ...@@ -11831,12 +11831,16 @@ if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os !=
SYSTEM_LIBLANGTAG=TRUE SYSTEM_LIBLANGTAG=TRUE
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.4.0) PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.4.0)
dnl cf. <https://bitbucket.org/tagoh/liblangtag/commits/9324836a0d1c> "Fix a build issue with inline keyword"
PKG_CHECK_EXISTS([liblangtag >= 0.5.5], [], [AC_DEFINE([LIBLANGTAG_INLINE_FIX])])
LIBLANGTAG_CFLAGS=$(printf '%s' "$LIBLANGTAG_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") LIBLANGTAG_CFLAGS=$(printf '%s' "$LIBLANGTAG_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
libo_MINGW_CHECK_DLL([liblangtag]) libo_MINGW_CHECK_DLL([liblangtag])
else else
SYSTEM_LIBLANGTAG= SYSTEM_LIBLANGTAG=
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
BUILD_TYPE="$BUILD_TYPE LIBLANGTAG" BUILD_TYPE="$BUILD_TYPE LIBLANGTAG"
dnl TODO: remove when liblangtag is updated to 0.5.5
AC_DEFINE([LIBLANGTAG_INLINE_FIX])
if test "$COM" = "MSC"; then if test "$COM" = "MSC"; then
LIBLANGTAG_LIBS="${WORKDIR}/UnpackedTarball/langtag/liblangtag/.libs/liblangtag.lib" LIBLANGTAG_LIBS="${WORKDIR}/UnpackedTarball/langtag/liblangtag/.libs/liblangtag.lib"
else else
...@@ -12929,6 +12933,7 @@ AC_CONFIG_HEADERS([config_host/config_gcc.h]) ...@@ -12929,6 +12933,7 @@ AC_CONFIG_HEADERS([config_host/config_gcc.h])
AC_CONFIG_HEADERS([config_host/config_global.h]) AC_CONFIG_HEADERS([config_host/config_global.h])
AC_CONFIG_HEADERS([config_host/config_graphite.h]) AC_CONFIG_HEADERS([config_host/config_graphite.h])
AC_CONFIG_HEADERS([config_host/config_lgpl.h]) AC_CONFIG_HEADERS([config_host/config_lgpl.h])
AC_CONFIG_HEADERS([config_host/config_liblangtag.h])
AC_CONFIG_HEADERS([config_host/config_locales.h]) AC_CONFIG_HEADERS([config_host/config_locales.h])
AC_CONFIG_HEADERS([config_host/config_mpl.h]) AC_CONFIG_HEADERS([config_host/config_mpl.h])
AC_CONFIG_HEADERS([config_host/config_orcus.h]) AC_CONFIG_HEADERS([config_host/config_orcus.h])
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
*/ */
#include <config_folders.h> #include <config_folders.h>
#include <config_liblangtag.h>
#include "i18nlangtag/languagetag.hxx" #include "i18nlangtag/languagetag.hxx"
#include "i18nlangtag/applelangid.hxx" #include "i18nlangtag/applelangid.hxx"
...@@ -24,10 +25,9 @@ ...@@ -24,10 +25,9 @@
//#define erDEBUG //#define erDEBUG
#if defined(ENABLE_LIBLANGTAG) #if defined(ENABLE_LIBLANGTAG)
#if defined(LIBLANGTAG_INLINE_FIX)
#define LT_HAVE_INLINE #define LT_HAVE_INLINE
// TODO: remove above line again for liblangtag >= 0.5.5, cf. #endif
// <https://bitbucket.org/tagoh/liblangtag/commits/9324836a0d1c> "Fix a
// build issue with inline keyword"
#include <liblangtag/langtag.h> #include <liblangtag/langtag.h>
#else #else
/* Replacement code for LGPL phobic and Android systems. /* Replacement code for LGPL phobic and Android systems.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment