sal/CppunitTest_sal_osl_file_details.mk | 1 - sal/Library_sal.mk | 1 - sal/osl/unx/system.hxx | 5 ++++- vcl/osx/DropTarget.cxx | 3 --- vcl/osx/PictToBmpFlt.cxx | 4 ---- vcl/osx/cuidraw.hxx | 2 +- vcl/osx/vclnsapp.mm | 1 - 7 files changed, 5 insertions(+), 12 deletions(-)
New commits: commit db3d15e46324ef4fcb9aee0b760f923f9a4fa231 Author: Dan Williams <[email protected]> AuthorDate: Tue Sep 16 07:12:23 2025 -0500 Commit: Patrick Luby <[email protected]> CommitDate: Wed Sep 17 17:04:07 2025 +0200 vcl/sal: remove unecessary Mac OS includes and linkage to Carbon A number of places that #include <Carbon/Carbon.h> don't actually need it, but want CoreFoundation or other includes instead. We're trying to get rid of Carbon so let's make it clearer what really needs it still. Change-Id: Ief60b4324dccd936aa7def3ea2c685c393f9050a Signed-off-by: Dan Williams <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191030 Reviewed-by: Patrick Luby <[email protected]> Tested-by: Jenkins diff --git a/sal/CppunitTest_sal_osl_file_details.mk b/sal/CppunitTest_sal_osl_file_details.mk index 921ec37cd4d1..64b1392a9b34 100644 --- a/sal/CppunitTest_sal_osl_file_details.mk +++ b/sal/CppunitTest_sal_osl_file_details.mk @@ -42,7 +42,6 @@ $(eval $(call gb_CppunitTest_use_library_objects,sal_osl_file_details,sal)) ifeq ($(OS),MACOSX) $(eval $(call gb_CppunitTest_use_system_darwin_frameworks,sal_osl_file_details, \ - Carbon \ CoreFoundation \ Foundation \ $(if $(ENABLE_MACOSX_SANDBOX),Security) \ diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 94e7fe10c5ca..b22ea22f1414 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -79,7 +79,6 @@ $(eval $(call gb_Library_add_libs,sal,\ ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_system_darwin_frameworks,sal,\ - Carbon \ CoreFoundation \ Foundation \ $(if $(ENABLE_MACOSX_SANDBOX),Security) \ diff --git a/sal/osl/unx/system.hxx b/sal/osl/unx/system.hxx index 1337913f7abb..078fa348905e 100644 --- a/sal/osl/unx/system.hxx +++ b/sal/osl/unx/system.hxx @@ -173,8 +173,11 @@ #ifdef MACOSX #define TimeValue CFTimeValue // Do not conflict with TimeValue in sal/inc/osl/time.h -#include <Carbon/Carbon.h> #undef TimeValue +# include <premac.h> +# include <CoreFoundation/CoreFoundation.h> +# include <postmac.h> +# include <signal.h> # include <dlfcn.h> # include <pthread.h> # include <sys/file.h> diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx index d9e34030d11f..c254c56ebf72 100644 --- a/vcl/osx/DropTarget.cxx +++ b/vcl/osx/DropTarget.cxx @@ -26,9 +26,6 @@ #include "DragActionConversion.hxx" #include "DragSource.hxx" #include <rtl/ustring.h> -#include <premac.h> -#include <Carbon/Carbon.h> -#include <postmac.h> #include <osx/salframe.h> #include <osx/salframeview.h> #include <cppuhelper/supportsservice.hxx> diff --git a/vcl/osx/PictToBmpFlt.cxx b/vcl/osx/PictToBmpFlt.cxx index a818cb5e752d..3533d830be8f 100644 --- a/vcl/osx/PictToBmpFlt.cxx +++ b/vcl/osx/PictToBmpFlt.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <premac.h> -#include <Carbon/Carbon.h> -#include <postmac.h> - #include <string.h> #include "PictToBmpFlt.hxx" diff --git a/vcl/osx/cuidraw.hxx b/vcl/osx/cuidraw.hxx index de625ce0a8a9..0338a5ec06ae 100644 --- a/vcl/osx/cuidraw.hxx +++ b/vcl/osx/cuidraw.hxx @@ -22,7 +22,7 @@ #include <sal/config.h> #include <premac.h> -#include <Carbon/Carbon.h> +#include <CoreFoundation/CoreFoundation.h> #include <postmac.h> #include <config_features.h> diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm index 399134a361e4..94ef94047757 100644 --- a/vcl/osx/vclnsapp.mm +++ b/vcl/osx/vclnsapp.mm @@ -40,7 +40,6 @@ #include <premac.h> #include <objc/objc-runtime.h> -#import "Carbon/Carbon.h" #import "apple_remote/RemoteControl.h" #include <postmac.h>
