[Libreoffice-commits] core.git: canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk canvas/StaticLibrary_directxcanvas.mk

[Noel Grandin (via logerrit)]

 canvas/Library_directx9canvas.mk      |    5 -----
 canvas/Library_gdipluscanvas.mk       |    5 -----
 canvas/StaticLibrary_directxcanvas.mk |    5 -----
 3 files changed, 15 deletions(-)

New commits:
commit f5f5d7476885fe6107cb9f39504078e833bfb27d
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue May 4 15:16:02 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue May 4 20:02:28 2021 +0200

    messing with UNOMINMAX no longer seems to be necessary
    
    and it sometimes causes trouble when including o3tl/strong_int.hxx
    
    Change-Id: I2957dc5c0159e1a9ab61681953023f6850de0125
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115098
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index 738999f8246e..28b10bb116d8 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -28,11 +28,6 @@ $(eval $(call gb_Library_set_componentfile,directx9canvas,canvas/source/directx/
 
 $(eval $(call gb_Library_use_sdk_api,directx9canvas))
 
-# clear NOMINMAX because GdiplusTypes.h uses those macros :(
-$(eval $(call gb_Library_add_defs,directx9canvas,\
-	-UNOMINMAX \
-))
-
 $(eval $(call gb_Library_use_external,directx9canvas,boost_headers))
 
 $(eval $(call gb_Library_use_libraries,directx9canvas,\
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index 80adf6f44d18..86634d401f94 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -30,11 +30,6 @@ $(eval $(call gb_Library_use_external,gdipluscanvas,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,gdipluscanvas))
 
-# clear NOMINMAX because GdiplusTypes.h uses those macros :(
-$(eval $(call gb_Library_add_defs,gdipluscanvas,\
-	-UNOMINMAX \
-))
-
 $(eval $(call gb_Library_use_libraries,gdipluscanvas,\
 	cppu \
 	tk \
diff --git a/canvas/StaticLibrary_directxcanvas.mk b/canvas/StaticLibrary_directxcanvas.mk
index c7f475248a5e..1e0d34409806 100644
--- a/canvas/StaticLibrary_directxcanvas.mk
+++ b/canvas/StaticLibrary_directxcanvas.mk
@@ -22,11 +22,6 @@ $(eval $(call gb_StaticLibrary_use_api,directxcanvas,\
     udkapi \
 ))
 
-# clear NOMINMAX because GdiplusTypes.h uses those macros :(
-$(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\
-	-UNOMINMAX \
-))
-
 $(eval $(call gb_StaticLibrary_add_exception_objects,directxcanvas,\
 	canvas/source/directx/dx_bitmap \
 	canvas/source/directx/dx_bitmapcanvashelper \