compilerplugins/Makefile-clang.mk | 3 ++-
configure.ac | 4 +++-
vcl/osx/saldata.cxx | 5 ++++-
3 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 8bfdb0a48d474f9288fcc368000c90bffbea6506
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Oct 8 17:40:35 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Oct 8 23:50:29 2019 +0200
loplugin:external
Change-Id: I31bf0f87cb66ac19dfa49566e9a190c8af8d408e
Reviewed-on: https://gerrit.libreoffice.org/80486
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx
index 8fda9e6f5fdf..ef46d6f4aa60 100644
--- a/vcl/osx/saldata.cxx
+++ b/vcl/osx/saldata.cxx
@@ -121,6 +121,7 @@ void SalData::ensureThreadAutoreleasePool()
}
}
+namespace {
NSImage* load_icon_by_name(const OUString& rIconName)
{
@@ -141,6 +142,8 @@ NSImage* load_icon_by_name(const OUString& rIconName)
return image;
}
+}
+
#define MAKE_CURSOR( vcl_name, name, name2 ) \
case vcl_name: \
aHotSpot = NSPoint{name##curs_x_hot, name##curs_y_hot}; \
commit ed654adf92eab0cd21744fbfbfe54ff6d42bed87
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Oct 8 17:39:33 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Oct 8 23:50:01 2019 +0200
loplugin:nullptr
Change-Id: I69e746d32b8a900fd9ee74ddc90b72cc6f9361db
Reviewed-on: https://gerrit.libreoffice.org/80484
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx
index e0e974ff1f3d..8fda9e6f5fdf 100644
--- a/vcl/osx/saldata.cxx
+++ b/vcl/osx/saldata.cxx
@@ -256,7 +256,7 @@ NSCursor* SalData::getCursor( PointerStyle i_eStyle )
NSAffineTransform *xform = [[NSAffineTransform alloc] init];
[xform scaleBy:scale];
id hints = @{ NSImageHintCTM: xform };
- CGImageRef rasterCGImage = [theImage CGImageForProposedRect:NULL
context:nil hints:hints];
+ CGImageRef rasterCGImage = [theImage
CGImageForProposedRect:nullptr context:nil hints:hints];
NSBitmapImageRep *rep = [[NSBitmapImageRep alloc]
initWithCGImage:rasterCGImage];
[rep setSize:cursorSize];
[multiResImage addRepresentation:rep];
commit ffdd79eda08b7ce4492d33fa265d24c60b88d173
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Oct 8 16:28:54 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Oct 8 23:49:36 2019 +0200
My Windows clang-cl build still doesn't use LO_CLANG_SHARED_PLUGINS
...so disable the new configure.ac checks introduced with
ad5cbcf6ba0afdc1d8d7405c2641cce8de4a360b "try to autodetect flags needed to
build Clang plugins" that are only relevant when using
LO_CLANG_SHARED_PLUGINS
and would fail miserably for my clang-cl build
Change-Id: I58f7f1f4608f1a615175f0c0d0d98c03c442a36c
Reviewed-on: https://gerrit.libreoffice.org/80477
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/compilerplugins/Makefile-clang.mk
b/compilerplugins/Makefile-clang.mk
index 0d599dcef59a..eb1ae04d0bf4 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -37,7 +37,8 @@ endif
# Whether to make plugins use one shared ASTRecursiveVisitor (plugins run
faster).
# By default enabled, disable if you work on an affected plugin (re-generating
takes time).
LO_CLANG_SHARED_PLUGINS=1
-#TODO:
+#TODO: Windows doesn't use LO_CLANG_SHARED_PLUGINS for now, see corresponding
TODO comment in
+# configure.ac:
ifeq ($(OS),WNT)
LO_CLANG_SHARED_PLUGINS=
endif
diff --git a/configure.ac b/configure.ac
index e387e4429f0b..5f3b2e71d2b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7041,7 +7041,9 @@ if test "$COM_IS_CLANG" = "TRUE"; then
add_warning "Cannot find Clang headers to build compiler
plugins, plugins disabled."
fi
])
- if test -n "$COMPILER_PLUGINS"; then
+ dnl TODO: Windows doesn't use LO_CLANG_SHARED_PLUGINS for now, see
corresponding TODO
+ dnl comment in compilerplugins/Makefile-clang.mk:
+ if test -n "$COMPILER_PLUGINS" && test "$_os" != "WINNT"; then
LDFLAGS=""
AC_MSG_CHECKING([for clang libraries to use])
if test -z "$CLANGTOOLLIBS"; then
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
