This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 6fa1fa2b88cbceb204fac1b1eeed6c94026ee988 Author: Damjan Jovanovic <[email protected]> AuthorDate: Sun Jul 5 06:25:14 2026 +0200 GTK+ headers include C++ headers when C++ 2011 is used, which breaks since we start this block: extern "C" { in prex.h and only close that curly bracket in postx.h, so those GTK+ headers included in between attempt to make C++ declarations inside this extern "C" block. Close that extern "C" block earlier, in prex.h, so it only affects the X11 header files. This appears to be enough to build OpenOffice on FreeBSD. Patch by: me --- main/tools/inc/tools/postx.h | 3 --- main/tools/inc/tools/prex.h | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/main/tools/inc/tools/postx.h b/main/tools/inc/tools/postx.h index fc27ffa5cb..0bd0956cf6 100644 --- a/main/tools/inc/tools/postx.h +++ b/main/tools/inc/tools/postx.h @@ -24,9 +24,6 @@ #ifndef _POSTX_H #define _POSTX_H -#if defined __cplusplus -} -#endif /* X-Types */ #undef Window diff --git a/main/tools/inc/tools/prex.h b/main/tools/inc/tools/prex.h index 365d579cb4..dcbe8b6fcd 100644 --- a/main/tools/inc/tools/prex.h +++ b/main/tools/inc/tools/prex.h @@ -46,6 +46,10 @@ extern "C" { #include <X11/extensions/Xrender.h> #include <X11/XKBlib.h> +#if defined __cplusplus +} +#endif + typedef unsigned long Pixel; #undef DestroyAll
