This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch Pilot-Pirx-boost
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/Pilot-Pirx-boost by this push:
new dc25ca6217 Additional files
dc25ca6217 is described below
commit dc25ca62177d41270ecba8e6a90a4747e0c0f678
Author: mseidel <msei...@apache.org>
AuthorDate: Fri Feb 16 00:56:41 2024 +0100
Additional files
---
main/boost/makefile.mk | 20 ++++++------
main/boost/prj/d.lst | 77 ++++++++++++++++++++++++++++++++++-----------
main/vcl/inc/vcl/bitmap.hxx | 2 --
3 files changed, 69 insertions(+), 30 deletions(-)
diff --git a/main/boost/makefile.mk b/main/boost/makefile.mk
index c6cd36e498..f78e4c4cf3 100644
--- a/main/boost/makefile.mk
+++ b/main/boost/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,20 +7,18 @@
# 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.
-#
+#
#**************************************************************
-
-
# dmake create_clean -- just unpacks
# dmake patch -- unpacks and applies patch file
# dmake create_patch -- creates a patch file
@@ -37,7 +35,7 @@ TARGET=ooo_boost
.IF "$(SYSTEM_BOOST)" == "YES"
all:
- @echo "An already available installation of boost should exist on your
system."
+ @echo "An already available installation of boost should exist on your
system."
@echo "Therefore the version provided here does not need to be built in
addition."
.ELSE # "$(SYSTEM_BOOST)" == "YES"
@@ -83,6 +81,7 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) :
$(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/archive
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/asio
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/assign
$(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/atomic
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bimap
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bind
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/chrono
$(INCCOM)$/$(PRJNAME)
@@ -92,6 +91,7 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) :
$(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept_check
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/container
$(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/coroutine
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/date_time
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/dynamic_bitset
$(INCCOM)$/$(PRJNAME)
@@ -103,10 +103,10 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) :
$(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/functional
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/function_types
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/fusion
$(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/geometry
$(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/geometry
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/gil
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/graph
$(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/graph
$(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/graph
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/icl
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/integer
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/interprocess
$(INCCOM)$/$(PRJNAME)
@@ -123,6 +123,7 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) :
$(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/msm
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/multi_array
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/multi_index
$(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/multiprecision
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/numeric
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/optional
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/parameter
$(INCCOM)$/$(PRJNAME)
@@ -170,3 +171,4 @@ $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize
.ENDIF # "$(SYSTEM_BOOST)" == "YES"
+# vim: set noet sw=4 ts=4:
diff --git a/main/boost/prj/d.lst b/main/boost/prj/d.lst
index 0b21f94e18..65850eb0fa 100644
--- a/main/boost/prj/d.lst
+++ b/main/boost/prj/d.lst
@@ -38,6 +38,8 @@ mkdir: %_DEST%\inc%_EXT%\boost\asio\ssl\old\detail
mkdir: %_DEST%\inc%_EXT%\boost\asio\windows
mkdir: %_DEST%\inc%_EXT%\boost\assign
mkdir: %_DEST%\inc%_EXT%\boost\assign\std
+mkdir: %_DEST%\inc%_EXT%\boost\atomic
+mkdir: %_DEST%\inc%_EXT%\boost\atomic\detail
mkdir: %_DEST%\inc%_EXT%\boost\bimap
mkdir: %_DEST%\inc%_EXT%\boost\bimap\container_adaptor
mkdir: %_DEST%\inc%_EXT%\boost\bimap\container_adaptor\detail
@@ -77,6 +79,11 @@ mkdir: %_DEST%\inc%_EXT%\boost\config\platform
mkdir: %_DEST%\inc%_EXT%\boost\config\stdlib
mkdir: %_DEST%\inc%_EXT%\boost\container
mkdir: %_DEST%\inc%_EXT%\boost\container\detail
+mkdir: %_DEST%\inc%_EXT%\boost\coroutine
+mkdir: %_DEST%\inc%_EXT%\boost\coroutine\v1
+mkdir: %_DEST%\inc%_EXT%\boost\coroutine\v1\detail
+mkdir: %_DEST%\inc%_EXT%\boost\coroutine\v2
+mkdir: %_DEST%\inc%_EXT%\boost\coroutine\v2\detail
mkdir: %_DEST%\inc%_EXT%\boost\date_time
mkdir: %_DEST%\inc%_EXT%\boost\date_time\gregorian
mkdir: %_DEST%\inc%_EXT%\boost\date_time\local_time
@@ -371,6 +378,10 @@ mkdir: %_DEST%\inc%_EXT%\boost\msm\mpl_graph\detail
mkdir: %_DEST%\inc%_EXT%\boost\multi_array
mkdir: %_DEST%\inc%_EXT%\boost\multi_index
mkdir: %_DEST%\inc%_EXT%\boost\multi_index\detail
+mkdir: %_DEST%\inc%_EXT%\boost\multiprecision
+mkdir: %_DEST%\inc%_EXT%\boost\multiprecision\cpp_int
+mkdir: %_DEST%\inc%_EXT%\boost\multiprecision\detail
+mkdir: %_DEST%\inc%_EXT%\boost\multiprecision\traits
mkdir: %_DEST%\inc%_EXT%\boost\numeric
mkdir: %_DEST%\inc%_EXT%\boost\numeric\conversion
mkdir: %_DEST%\inc%_EXT%\boost\numeric\conversion\detail
@@ -379,6 +390,26 @@ mkdir: %_DEST%\inc%_EXT%\boost\numeric\interval
mkdir: %_DEST%\inc%_EXT%\boost\numeric\interval\compare
mkdir: %_DEST%\inc%_EXT%\boost\numeric\interval\detail
mkdir: %_DEST%\inc%_EXT%\boost\numeric\interval\ext
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\algebra
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\external
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\external\openmp
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\external\thrust
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\external\vexcl
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\external\viennacl
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\integrate
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\integrate\detail
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\iterator
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\iterator\detail
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\iterator\impl
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\iterator\integrate
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\iterator\integrate\detail
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\stepper
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\stepper\base
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\stepper\detail
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\stepper\generation
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\util
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\odeint\util\detail
mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas
mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas\detail
mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas\experimental
@@ -523,16 +554,6 @@ mkdir: %_DEST%\inc%_EXT%\boost\signals2\detail
mkdir: %_DEST%\inc%_EXT%\boost\smart_ptr
mkdir: %_DEST%\inc%_EXT%\boost\smart_ptr\detail
mkdir: %_DEST%\inc%_EXT%\boost\spirit
-mkdir: %_DEST%\inc%_EXT%\boost\spirit\actor
-mkdir: %_DEST%\inc%_EXT%\boost\spirit\attribute
-mkdir: %_DEST%\inc%_EXT%\boost\spirit\core
-mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\composite
-mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal
-mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\primitives
-mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\scanner
-mkdir: %_DEST%\inc%_EXT%\boost\spirit\debug
-mkdir: %_DEST%\inc%_EXT%\boost\spirit\dynamic
-mkdir: %_DEST%\inc%_EXT%\boost\spirit\error_handling
mkdir: %_DEST%\inc%_EXT%\boost\spirit\home
mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic
mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor
@@ -786,6 +807,8 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail
..\%__SRC%\inc\boost\asio\windows\* %_DEST%\inc%_EXT%\boost\asio\windows
..\%__SRC%\inc\boost\assign\* %_DEST%\inc%_EXT%\boost\assign
..\%__SRC%\inc\boost\assign\std\* %_DEST%\inc%_EXT%\boost\assign\std
+..\%__SRC%\inc\boost\atomic\* %_DEST%\inc%_EXT%\boost\atomic
+..\%__SRC%\inc\boost\atomic\std\* %_DEST%\inc%_EXT%\boost\atomic\detail
..\%__SRC%\inc\boost\bimap\* %_DEST%\inc%_EXT%\boost\bimap
..\%__SRC%\inc\boost\bimap\container_adaptor\*
%_DEST%\inc%_EXT%\boost\bimap\container_adaptor
..\%__SRC%\inc\boost\bimap\container_adaptor\detail\*
%_DEST%\inc%_EXT%\boost\bimap\container_adaptor\detail
@@ -820,7 +843,12 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail
..\%__SRC%\inc\boost\config\platform\* %_DEST%\inc%_EXT%\boost\config\platform
..\%__SRC%\inc\boost\config\stdlib\* %_DEST%\inc%_EXT%\boost\config\stdlib
..\%__SRC%\inc\boost\container\* %_DEST%\inc%_EXT%\boost\container
-..\%__SRC%\inc\boost\container\detail\*
%_DEST%\inc%_EXT%\boost\container\detail
+..\%__SRC%\inc\boost\coroutine\detail\*
%_DEST%\inc%_EXT%\boost\container\detail
+..\%__SRC%\inc\boost\coroutine\* %_DEST%\inc%_EXT%\boost\coroutine
+..\%__SRC%\inc\boost\coroutine\v1\* %_DEST%\inc%_EXT%\boost\coroutine\v1
+..\%__SRC%\inc\boost\coroutine\v1\detail\*
%_DEST%\inc%_EXT%\boost\coroutine\v1\detail
+..\%__SRC%\inc\boost\coroutine\v2\* %_DEST%\inc%_EXT%\boost\coroutine\v2
+..\%__SRC%\inc\boost\coroutine\v2\detail\*
%_DEST%\inc%_EXT%\boost\coroutine\v2\detail
..\%__SRC%\inc\boost\date_time\* %_DEST%\inc%_EXT%\boost\date_time
..\%__SRC%\inc\boost\date_time\gregorian\*
%_DEST%\inc%_EXT%\boost\date_time\gregorian
..\%__SRC%\inc\boost\date_time\local_time\*
%_DEST%\inc%_EXT%\boost\date_time\local_time
@@ -1101,6 +1129,10 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail
..\%__SRC%\inc\boost\multi_array\* %_DEST%\inc%_EXT%\boost\multi_array
..\%__SRC%\inc\boost\multi_index\* %_DEST%\inc%_EXT%\boost\multi_index
..\%__SRC%\inc\boost\multi_index\detail\*
%_DEST%\inc%_EXT%\boost\multi_index\detail
+..\%__SRC%\inc\boost\multiprecision\* %_DEST%\inc%_EXT%\boost\multiprecision
+..\%__SRC%\inc\boost\multiprecision\cpp_int\*
%_DEST%\inc%_EXT%\boost\multiprecision\cpp_int
+..\%__SRC%\inc\boost\multiprecision\detail\*
%_DEST%\inc%_EXT%\boost\multiprecision\detail
+..\%__SRC%\inc\boost\multiprecision\traits\*
%_DEST%\inc%_EXT%\boost\multiprecision\traits
..\%__SRC%\inc\boost\numeric\conversion\*
%_DEST%\inc%_EXT%\boost\numeric\conversion
..\%__SRC%\inc\boost\numeric\conversion\detail\*
%_DEST%\inc%_EXT%\boost\numeric\conversion\detail
..\%__SRC%\inc\boost\numeric\conversion\detail\preprocessed\*
%_DEST%\inc%_EXT%\boost\numeric\conversion\detail\preprocessed
@@ -1109,6 +1141,18 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail
..\%__SRC%\inc\boost\numeric\interval\*
%_DEST%\inc%_EXT%\boost\numeric\interval
..\%__SRC%\inc\boost\numeric\interval\detail\*
%_DEST%\inc%_EXT%\boost\numeric\interval\detail
..\%__SRC%\inc\boost\numeric\interval\ext\*
%_DEST%\inc%_EXT%\boost\numeric\interval\ext
+..\%__SRC%\inc\boost\numeric\odeint\* %_DEST%\inc%_EXT%\boost\numeric\odeint
+..\%__SRC%\inc\boost\numeric\odeint\algebra\*
%_DEST%\inc%_EXT%\boost\numeric\odeint\algebra
+..\%__SRC%\inc\boost\numeric\odeint\external\*
%_DEST%\inc%_EXT%\boost\numeric\odeint\external
+..\%__SRC%\inc\boost\numeric\odeint\external\vesxcl\*
%_DEST%\inc%_EXT%\boost\numeric\odeint\external\vexcl
+..\%__SRC%\inc\boost\numeric\odeint\external\viennacl\*
%_DEST%\inc%_EXT%\boost\numeric\odeint\external\viennacl
+..\%__SRC%\inc\boost\numeric\odeint\integrate\*
%_DEST%\inc%_EXT%\boost\numeric\odeint\integrate
+..\%__SRC%\inc\boost\numeric\odeint\integrate\detail\*
%_DEST%\inc%_EXT%\boost\numeric\odeint\integrate\detail
+..\%__SRC%\inc\boost\numeric\odeint\stepper\*
%_DEST%\inc%_EXT%\boost\numeric\odeint\stepper
+..\%__SRC%\inc\boost\numeric\odeint\stepper\base\*
%_DEST%\inc%_EXT%\boost\numeric\odeint\stepper\base
+..\%__SRC%\inc\boost\numeric\odeint\stepper\detail\*
%_DEST%\inc%_EXT%\boost\numeric\odeint\stepper\detail
+..\%__SRC%\inc\boost\numeric\odeint\stepper\generation\*
%_DEST%\inc%_EXT%\boost\numeric\odeint\stepper\generation
+..\%__SRC%\inc\boost\numeric\odeint\util\*
%_DEST%\inc%_EXT%\boost\numeric\odeint\util
..\%__SRC%\inc\boost\numeric\ublas\* %_DEST%\inc%_EXT%\boost\numeric\ublas
..\%__SRC%\inc\boost\numeric\ublas\detail\*
%_DEST%\inc%_EXT%\boost\numeric\ublas\detail
..\%__SRC%\inc\boost\numeric\ublas\experimental\*
%_DEST%\inc%_EXT%\boost\numeric\ublas\experimental
@@ -1257,8 +1301,6 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail
..\%__SRC%\inc\boost\spirit\core\scanner\*
%_DEST%\inc%_EXT%\boost\spirit\core\scanner
..\%__SRC%\inc\boost\spirit\debug\* %_DEST%\inc%_EXT%\boost\spirit\debug
..\%__SRC%\inc\boost\spirit\* %_DEST%\inc%_EXT%\boost\spirit
-..\%__SRC%\inc\boost\spirit\dynamic\* %_DEST%\inc%_EXT%\boost\spirit\dynamic
-..\%__SRC%\inc\boost\spirit\error_handling\*
%_DEST%\inc%_EXT%\boost\spirit\error_handling
..\%__SRC%\inc\boost\spirit\home\classic\actor\*
%_DEST%\inc%_EXT%\boost\spirit\home\classic\actor
..\%__SRC%\inc\boost\spirit\home\classic\attribute\*
%_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute
..\%__SRC%\inc\boost\spirit\home\classic\core\composite\*
%_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite
@@ -1449,12 +1491,8 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail
..\%__SRC%\inc\boost\uuid\* %_DEST%\inc%_EXT%\boost\uuid
..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant
..\%__SRC%\inc\boost\variant\detail\* %_DEST%\inc%_EXT%\boost\variant\detail
-mkdir: %_DEST%\inc%_EXT%\boost\lambda
-..\%__SRC%\misc\build\boost-1.30.2\boost\lambda\*.*pp
%_DEST%\inc%_EXT%\boost\lambda\*.*pp
-..\%__SRC%\misc\build\boost_1_48_0\boost\lambda\*
%_DEST%\inc%_EXT%\boost\lambda
-mkdir: %_DEST%\inc%_EXT%\boost\lambda\detail
-..\%__SRC%\misc\build\boost-1.30.2\boost\lambda\detail\*.*pp
%_DEST%\inc%_EXT%\boost\lambda\detail\*.*pp
-..\%__SRC%\misc\build\boost_1_48_0\boost\lambda\detail\*
%_DEST%\inc%_EXT%\boost\lambda\detail
+..\%__SRC%\inc\boost\lambda\* %_DEST%\inc%_EXT%\boost\lambda
+..\%__SRC%\inc\boost\lambda\detail\* %_DEST%\inc%_EXT%\boost\lambda\detail
..\%__SRC%\inc\boost\wave\cpplexer\* %_DEST%\inc%_EXT%\boost\wave\cpplexer
..\%__SRC%\inc\boost\wave\cpplexer\re2clex\*
%_DEST%\inc%_EXT%\boost\wave\cpplexer\re2clex
..\%__SRC%\inc\boost\wave\* %_DEST%\inc%_EXT%\boost\wave
@@ -1471,3 +1509,4 @@ mkdir: %_DEST%\inc%_EXT%\boost\lambda\detail
..\%__SRC%\inc\boost\xpressive\detail\utility\*
%_DEST%\inc%_EXT%\boost\xpressive\detail\utility
..\%__SRC%\inc\boost\xpressive\traits\*
%_DEST%\inc%_EXT%\boost\xpressive\traits
..\%__SRC%\inc\boost\xpressive\traits\detail\*
%_DEST%\inc%_EXT%\boost\xpressive\traits\detail
+
diff --git a/main/vcl/inc/vcl/bitmap.hxx b/main/vcl/inc/vcl/bitmap.hxx
index 77e907a832..af865d1f1b 100644
--- a/main/vcl/inc/vcl/bitmap.hxx
+++ b/main/vcl/inc/vcl/bitmap.hxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef _SV_BITMAP_HXX
#define _SV_BITMAP_HXX
