include/LibreOfficeKit/LibreOfficeKitInit.h |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0933a2435d4459f5252c1a12f8686733910be970
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Oct 24 13:46:56 2022 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Oct 24 17:16:59 2022 +0200

    lok: Undefine DELETE after including Windows headers
    
    This identifier is used e.g. in offapi/com/sun/star/awt/Key.idl,
    include/vcl/keycod.hxx, and that silly define in Windows headers
    conflicts when building gtktiledviewer on Windows.
    
    This is similar to include/postwin.h.
    
    Change-Id: I177ab720864468e36b4f4b437a304cfe6ee09e35
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141737
    Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    (cherry picked from commit fe0795c52f783a0cfb9e90aab4ae6fac4eac68df)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141741
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index 5bbb722b5b18..2ceeab052e33 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -54,6 +54,8 @@
     #define SEPARATOR         '\\'
     #define UNOPATH           "\\..\\URE\\bin"
 
+    #undef DELETE
+
 #endif
 
 #ifdef __cplusplus

Reply via email to