diff options
| author | Moonchild <moonchild@palemoon.org> | 2023-11-09 12:54:20 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2023-11-09 12:54:20 +0000 |
| commit | 93eee35e84c29e1e64cb1531a0830b8ab2a7c5fa (patch) | |
| tree | 471dc71142eeb45762f3980ad5755386998d3ec9 | |
| parent | ad134c48d60e81f6a04bfbcd990d38b2dd9ba389 (diff) | |
| parent | bcc531f53b94c6f05a65da0a104e2444c38ff91e (diff) | |
| download | uxp-93eee35e84c29e1e64cb1531a0830b8ab2a7c5fa.tar.gz | |
Merge pull request 'Fix Linux and Oracle Solaris builds after recent changes.' (#2377) from dbsoft/UXP:sedfix-2376 into master
Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/2377
| -rw-r--r-- | old-configure.in | 9 | ||||
| -rw-r--r-- | other-licenses/atk-1.0/atk/atkobject.h | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/old-configure.in b/old-configure.in index 8785bc9467..5c7e3c4411 100644 --- a/old-configure.in +++ b/old-configure.in @@ -5235,7 +5235,14 @@ ac_configure_args="$_SUBDIR_CONFIG_ARGS" # --with-system-nspr will have been converted into the relevant $NSPR_CFLAGS # and $NSPR_LIBS. -ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr[^[:space:]]* *//'`" +case "${OS_TARGET}" in + Darwin|DragonFly|FreeBSD|NetBSD|OpenBSD) + ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr[^[:space:]]* *//'`" + ;; + *) + ac_configure_args="`echo $ac_configure_args | ${TOOLCHAIN_PREFIX}sed -e 's/--with-system-nspr\S* *//'`" + ;; +esac if test -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'" diff --git a/other-licenses/atk-1.0/atk/atkobject.h b/other-licenses/atk-1.0/atk/atkobject.h index 987f2cefce..de9da63134 100644 --- a/other-licenses/atk-1.0/atk/atkobject.h +++ b/other-licenses/atk-1.0/atk/atkobject.h @@ -20,14 +20,14 @@ #ifndef __ATK_OBJECT_H__ #define __ATK_OBJECT_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include <glib-object.h> #include <atk/atkstate.h> #include <atk/atkrelationtype.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + /* * AtkObject represents the minimum information all accessible objects * return. This information includes accessible name, accessible |