This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new fe5d43d9f0 Maintenance cleanup
fe5d43d9f0 is described below
commit fe5d43d9f07528b759454a4b85b1b3ca9335ba40
Author: mseidel <[email protected]>
AuthorDate: Thu Oct 26 11:43:48 2023 +0200
Maintenance cleanup
---
.../win32/shlxthandler/columninfo/makefile.mk | 16 +++--
main/shell/source/win32/shlxthandler/exports.dxp | 6 +-
.../source/win32/shlxthandler/infotips/makefile.mk | 2 +
main/shell/source/win32/shlxthandler/makefile.mk | 67 +++++++++----------
.../source/win32/shlxthandler/ooofilt/exports.dxp | 6 +-
.../source/win32/shlxthandler/ooofilt/makefile.mk | 76 +++++++++++-----------
.../source/win32/shlxthandler/prophdl/exports.dxp | 4 +-
.../source/win32/shlxthandler/prophdl/makefile.mk | 72 ++++++++++----------
.../win32/shlxthandler/propsheets/makefile.mk | 12 ++--
.../win32/shlxthandler/thumbviewer/makefile.mk | 13 ++--
10 files changed, 143 insertions(+), 131 deletions(-)
diff --git a/main/shell/source/win32/shlxthandler/columninfo/makefile.mk
b/main/shell/source/win32/shlxthandler/columninfo/makefile.mk
index de7ef1a5b6..4604c4d9d3 100644
--- a/main/shell/source/win32/shlxthandler/columninfo/makefile.mk
+++ b/main/shell/source/win32/shlxthandler/columninfo/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
@@ -30,7 +30,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
+.INCLUDE : settings.mk
CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK
-DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
@@ -48,8 +48,10 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
.ENDIF # "$(BUILD_X64)"!=""
# --- Targets ------------------------------------------------------
-.INCLUDE : set_wntx64.mk
+.INCLUDE : set_wntx64.mk
.INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.INCLUDE : tg_wntx64.mk
+.INCLUDE : tg_wntx64.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/shell/source/win32/shlxthandler/exports.dxp
b/main/shell/source/win32/shlxthandler/exports.dxp
index 953039ccc9..44b49305c2 100644
--- a/main/shell/source/win32/shlxthandler/exports.dxp
+++ b/main/shell/source/win32/shlxthandler/exports.dxp
@@ -1,4 +1,4 @@
DllRegisterServer PRIVATE
-DllUnregisterServer PRIVATE
-DllGetClassObject PRIVATE
-DllCanUnloadNow PRIVATE
\ No newline at end of file
+DllUnregisterServer PRIVATE
+DllGetClassObject PRIVATE
+DllCanUnloadNow PRIVATE
diff --git a/main/shell/source/win32/shlxthandler/infotips/makefile.mk
b/main/shell/source/win32/shlxthandler/infotips/makefile.mk
index c26f00dab8..b048c84fdd 100644
--- a/main/shell/source/win32/shlxthandler/infotips/makefile.mk
+++ b/main/shell/source/win32/shlxthandler/infotips/makefile.mk
@@ -54,3 +54,5 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
INCLUDE!:=$(subst,/stl, $(INCLUDE))
.INCLUDE : tg_wntx64.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/shell/source/win32/shlxthandler/makefile.mk
b/main/shell/source/win32/shlxthandler/makefile.mk
index 7878bdaaa1..3dc17c24cb 100644
--- a/main/shell/source/win32/shlxthandler/makefile.mk
+++ b/main/shell/source/win32/shlxthandler/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
@@ -35,7 +35,7 @@ USE_STLP_DEBUG=
# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
+.INCLUDE : settings.mk
UWINAPILIB =
UWINAPILIB_X64 =
@@ -63,29 +63,29 @@ SHL1LIBS=
.ELSE
SHL1STDLIBS=
SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\
- $(SOLARLIBDIR)$/expat_xmlparse.lib\
- $(SOLARLIBDIR)$/expat_xmltok.lib
+ $(SOLARLIBDIR)$/expat_xmlparse.lib\
+ $(SOLARLIBDIR)$/expat_xmltok.lib
.ENDIF
SHL1STDLIBS+=\
- $(OLEAUT32LIB)\
- $(ADVAPI32LIB)\
- $(OLE32LIB)\
- $(UUIDLIB)\
- $(SHELL32LIB)\
- $(KERNEL32LIB)\
- $(GDI32LIB)\
- $(GDIPLUSLIB)
+ $(OLEAUT32LIB)\
+ $(ADVAPI32LIB)\
+ $(OLE32LIB)\
+ $(UUIDLIB)\
+ $(SHELL32LIB)\
+ $(KERNEL32LIB)\
+ $(GDI32LIB)\
+ $(GDIPLUSLIB)
.IF "$(COM)"!="GCC"
SHL1STDLIBS+=\
- msvcprt.lib
+ msvcprt.lib
.ENDIF
SHL1STDLIBS+=\
- $(SHLWAPILIB)
+ $(SHLWAPILIB)
SHL1LIBS+=$(SLB)$/util.lib\
- $(SLB)$/ooofilereader.lib
+ $(SLB)$/ooofilereader.lib
SHL1DEPN=
@@ -115,26 +115,26 @@ SLOFILES_X64= \
SHL1TARGET_X64=$(TARGET)
SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\
- $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\
- $(SOLARLIBDIR_X64)$/expat_xmltok.lib
+ $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\
+ $(SOLARLIBDIR_X64)$/expat_xmltok.lib
SHL1STDLIBS_X64+=\
- $(OLEAUT32LIB_X64)\
- $(ADVAPI32LIB_X64)\
- $(OLE32LIB_X64)\
- $(UUIDLIB_X64)\
- $(SHELL32LIB_X64)\
- $(KERNEL32LIB_X64)\
- $(GDI32LIB_X64)\
- $(USER32LIB_X64) \
- $(GDIPLUSLIB_X64) \
- $(MSVCRT_X64) \
- $(MSVCPRT_X64) \
+ $(OLEAUT32LIB_X64)\
+ $(ADVAPI32LIB_X64)\
+ $(OLE32LIB_X64)\
+ $(UUIDLIB_X64)\
+ $(SHELL32LIB_X64)\
+ $(KERNEL32LIB_X64)\
+ $(GDI32LIB_X64)\
+ $(USER32LIB_X64) \
+ $(GDIPLUSLIB_X64) \
+ $(MSVCRT_X64) \
+ $(MSVCPRT_X64) \
$(OLDNAMESLIB_X64) \
- msvcprt.lib
+ msvcprt.lib
SHL1LIBS_X64+=$(SLB_X64)$/util.lib\
- $(SLB_X64)$/ooofilereader.lib
+ $(SLB_X64)$/ooofilereader.lib
SHL1OBJS_X64=$(SLOFILES_X64)
SHL1DEF_X64=$(MISC_X64)$/$(SHL1TARGET).def
SHL1RES_X64=$(RES_X64)$/$(TARGET).res
@@ -151,3 +151,4 @@ INCLUDE!:=$(subst,/stl, $(INCLUDE))
.INCLUDE : tg_wntx64.mk
+# vim: set noet sw=4 ts=4:
diff --git a/main/shell/source/win32/shlxthandler/ooofilt/exports.dxp
b/main/shell/source/win32/shlxthandler/ooofilt/exports.dxp
index 953039ccc9..44b49305c2 100644
--- a/main/shell/source/win32/shlxthandler/ooofilt/exports.dxp
+++ b/main/shell/source/win32/shlxthandler/ooofilt/exports.dxp
@@ -1,4 +1,4 @@
DllRegisterServer PRIVATE
-DllUnregisterServer PRIVATE
-DllGetClassObject PRIVATE
-DllCanUnloadNow PRIVATE
\ No newline at end of file
+DllUnregisterServer PRIVATE
+DllGetClassObject PRIVATE
+DllCanUnloadNow PRIVATE
diff --git a/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk
b/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk
index 98c668896a..c0e2c1a8f8 100644
--- a/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk
+++ b/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
@@ -37,21 +37,21 @@ UWINAPILIB=
# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
+.INCLUDE : settings.mk
CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK
-DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
CDEFS+=-D_WIN32_IE=0x501
-# SCPCDEFS+=-D_STLP_USE_STATIC_LIB
+# SCPCDEFS+=-D_STLP_USE_STATIC_LIB
# --- Files --------------------------------------------------------
SLOFILES=$(SLO)$/ooofilt.obj\
- $(SLO)$/propspec.obj\
- $(SLO)$/stream_helper.obj
+ $(SLO)$/propspec.obj\
+ $(SLO)$/stream_helper.obj
-# $(SLO)$/utilities.obj
-# $(SLO)$/dbgmacros.obj
+# $(SLO)$/utilities.obj
+# $(SLO)$/dbgmacros.obj
SHL1TARGET=$(TARGET)
.IF "$(COM)"=="GCC"
@@ -60,16 +60,16 @@ SHL1LIBS=
.ELSE
SHL1STDLIBS=
SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\
- $(SOLARLIBDIR)$/expat_xmlparse.lib\
- $(SOLARLIBDIR)$/expat_xmltok.lib
+ $(SOLARLIBDIR)$/expat_xmlparse.lib\
+ $(SOLARLIBDIR)$/expat_xmltok.lib
.ENDIF
SHL1STDLIBS+=$(OLE32LIB)\
- $(ADVAPI32LIB)\
- $(COMCTL32LIB)\
- $(UUIDLIB)\
- $(SHELL32LIB)\
- $(KERNEL32LIB)\
- $(OLDNAMESLIB)
+ $(ADVAPI32LIB)\
+ $(COMCTL32LIB)\
+ $(UUIDLIB)\
+ $(SHELL32LIB)\
+ $(KERNEL32LIB)\
+ $(OLDNAMESLIB)
.IF "$(COM)"!="GCC"
SHL1STDLIBS+=msvcprt.lib
@@ -79,12 +79,12 @@ SHL1STDLIBS+=msvcrt.lib
.ENDIF
.ENDIF
-
-# $(LIBSTLPORTST)
-
+
+# $(LIBSTLPORTST)
+
SHL1LIBS+=$(SLB)$/util.lib\
- $(SLB)$/ooofilereader.lib
-
+ $(SLB)$/ooofilereader.lib
+
SHL1DEPN=
SHL1OBJS=$(SLOFILES)
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
@@ -100,28 +100,28 @@ CDEFS_X64+=-D_WIN32_IE=0x501
USE_DEFFILE_X64=TRUE
SLOFILES_X64=$(SLO_X64)$/ooofilt.obj\
- $(SLO_X64)$/propspec.obj\
- $(SLO_X64)$/stream_helper.obj
+ $(SLO_X64)$/propspec.obj\
+ $(SLO_X64)$/stream_helper.obj
SHL1TARGET_X64=$(TARGET)
SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\
- $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\
- $(SOLARLIBDIR_X64)$/expat_xmltok.lib
+ $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\
+ $(SOLARLIBDIR_X64)$/expat_xmltok.lib
SHL1STDLIBS_X64+=$(OLE32LIB_X64)\
- $(ADVAPI32LIB_X64)\
- $(COMCTL32LIB_X64)\
- $(UUIDLIB_X64)\
- $(USER32LIB_X64) \
- $(SHELL32LIB_X64)\
- $(KERNEL32LIB_X64)\
- $(MSVCPRT_X64) \
- $(MSVCRT_X64) \
- $(OLDNAMESLIB_X64)
+ $(ADVAPI32LIB_X64)\
+ $(COMCTL32LIB_X64)\
+ $(UUIDLIB_X64)\
+ $(USER32LIB_X64) \
+ $(SHELL32LIB_X64)\
+ $(KERNEL32LIB_X64)\
+ $(MSVCPRT_X64) \
+ $(MSVCRT_X64) \
+ $(OLDNAMESLIB_X64)
SHL1LIBS_X64+=$(SLB_X64)$/util.lib\
- $(SLB_X64)$/ooofilereader.lib
+ $(SLB_X64)$/ooofilereader.lib
SHL1OBJS_X64=$(SLOFILES_X64)
SHL1DEF_X64=$(MISC_X64)$/$(SHL1TARGET_X64).def
DEF1NAME_X64=$(SHL1TARGET_X64)
@@ -135,3 +135,5 @@ DEF1EXPORTFILE_X64=exports.dxp
INCLUDE!:=$(subst,/stl, $(INCLUDE))
.INCLUDE : tg_wntx64.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/shell/source/win32/shlxthandler/prophdl/exports.dxp
b/main/shell/source/win32/shlxthandler/prophdl/exports.dxp
index 2ada8255f8..1c25f53f6e 100644
--- a/main/shell/source/win32/shlxthandler/prophdl/exports.dxp
+++ b/main/shell/source/win32/shlxthandler/prophdl/exports.dxp
@@ -1,2 +1,2 @@
-DllGetClassObject PRIVATE
-DllCanUnloadNow PRIVATE
\ No newline at end of file
+DllGetClassObject PRIVATE
+DllCanUnloadNow PRIVATE
diff --git a/main/shell/source/win32/shlxthandler/prophdl/makefile.mk
b/main/shell/source/win32/shlxthandler/prophdl/makefile.mk
index c8127beae1..a84926175c 100644
--- a/main/shell/source/win32/shlxthandler/prophdl/makefile.mk
+++ b/main/shell/source/win32/shlxthandler/prophdl/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
@@ -34,7 +34,7 @@ USE_DEFFILE_X64=TRUE
# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
+.INCLUDE : settings.mk
UWINAPILIB =
UWINAPILIB_X64 =
@@ -56,24 +56,24 @@ SHL1LIBS=
.ELSE
SHL1STDLIBS=
SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\
- $(SOLARLIBDIR)$/expat_xmlparse.lib\
- $(SOLARLIBDIR)$/expat_xmltok.lib
+ $(SOLARLIBDIR)$/expat_xmlparse.lib\
+ $(SOLARLIBDIR)$/expat_xmltok.lib
.ENDIF
SHL1STDLIBS+=\
- $(OLEAUT32LIB)\
- $(ADVAPI32LIB)\
- $(OLE32LIB)\
- $(UUIDLIB)\
- $(SHELL32LIB)\
- $(KERNEL32LIB)\
- $(GDI32LIB)\
- $(GDIPLUSLIB)\
- $(SHLWAPILIB)\
- $(PROPSYSLIB)
+ $(OLEAUT32LIB)\
+ $(ADVAPI32LIB)\
+ $(OLE32LIB)\
+ $(UUIDLIB)\
+ $(SHELL32LIB)\
+ $(KERNEL32LIB)\
+ $(GDI32LIB)\
+ $(GDIPLUSLIB)\
+ $(SHLWAPILIB)\
+ $(PROPSYSLIB)
.IF "$(COM)"!="GCC"
SHL1STDLIBS+=\
- msvcprt.lib
+ msvcprt.lib
.IF "$(PRODUCT)"!="full"
SHL1STDLIBS+=msvcrt.lib
@@ -81,7 +81,7 @@ SHL1STDLIBS+=msvcrt.lib
.ENDIF
SHL1LIBS+=$(SLB)$/util.lib\
- $(SLB)$/ooofilereader.lib
+ $(SLB)$/ooofilereader.lib
SHL1DEPN=
SHL1OBJS=$(SLOFILES)
@@ -102,26 +102,26 @@ SLOFILES_X64= \
SHL1TARGET_X64=$(TARGET)
SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\
- $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\
- $(SOLARLIBDIR_X64)$/expat_xmltok.lib
+ $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\
+ $(SOLARLIBDIR_X64)$/expat_xmltok.lib
SHL1STDLIBS_X64+=\
- $(OLEAUT32LIB_X64)\
- $(ADVAPI32LIB_X64)\
- $(OLE32LIB_X64)\
- $(UUIDLIB_X64)\
- $(SHELL32LIB_X64)\
- $(KERNEL32LIB_X64)\
- $(GDI32LIB_X64)\
- $(USER32LIB_X64) \
- $(GDIPLUSLIB_X64) \
- $(MSVCRT_X64) \
- $(MSVCPRT_X64) \
+ $(OLEAUT32LIB_X64)\
+ $(ADVAPI32LIB_X64)\
+ $(OLE32LIB_X64)\
+ $(UUIDLIB_X64)\
+ $(SHELL32LIB_X64)\
+ $(KERNEL32LIB_X64)\
+ $(GDI32LIB_X64)\
+ $(USER32LIB_X64) \
+ $(GDIPLUSLIB_X64) \
+ $(MSVCRT_X64) \
+ $(MSVCPRT_X64) \
$(OLDNAMESLIB_X64)\
$(PROPSYSLIB_X64)
SHL1LIBS_X64+=$(SLB_X64)$/util.lib\
- $(SLB_X64)$/ooofilereader.lib
+ $(SLB_X64)$/ooofilereader.lib
SHL1OBJS_X64=$(SLOFILES_X64)
SHL1DEF_X64=$(MISC_X64)$/$(SHL1TARGET).def
@@ -131,8 +131,10 @@ DEF1EXPORTFILE_X64=exports.dxp
.ENDIF # "$(BUILD_X64)"!=""
# --- Targets ------------------------------------------------------
-.INCLUDE : set_wntx64.mk
+.INCLUDE : set_wntx64.mk
.INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.INCLUDE : tg_wntx64.mk
+.INCLUDE : tg_wntx64.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/shell/source/win32/shlxthandler/propsheets/makefile.mk
b/main/shell/source/win32/shlxthandler/propsheets/makefile.mk
index cf3ed29d25..49da16963f 100644
--- a/main/shell/source/win32/shlxthandler/propsheets/makefile.mk
+++ b/main/shell/source/win32/shlxthandler/propsheets/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
@@ -29,7 +29,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
+.INCLUDE : settings.mk
CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK
-DUNICODE -D_UNICODE
CDEFS+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -U_WIN32_IE -D_WIN32_IE=0x501
@@ -59,3 +59,5 @@ SLOFILES_X64=$(SLO_X64)$/propsheets.obj\
INCLUDE!:=$(subst,/stl, $(INCLUDE))
.INCLUDE : tg_wntx64.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
b/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
index a498d14a85..534c4009aa 100644
--- a/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
+++ b/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
@@ -29,7 +29,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
+.INCLUDE : settings.mk
CFLAGS+=-DWIN32_LEAN_AND_MEAN -D_NTSDK -DUNICODE -D_UNICODE
-D_WIN32_WINNT=0x0501
#CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
@@ -53,6 +53,7 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
.INCLUDE : set_wntx64.mk
.INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-
+
.INCLUDE : tg_wntx64.mk
+# vim: set noet sw=4 ts=4:
