[Libreoffice-commits] core.git: sal/rtl

Julien Nabet serval2412 at yahoo.fr
Mon Dec 29 01:03:07 PST 2014


 sal/rtl/bootstrap.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5f2cfd1beed6466715b7a1ed6a22b93cc250c79b
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Dec 29 10:01:09 2014 +0100

    "NOMINMAX" is not used [-Werror=unused-macros]
    
    So let's let this for Windows only
    
    Change-Id: I1f76e03b0e3431a6954a75f5cb247ef1a1644a28

diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 0d86131..0ddeb5f 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -16,8 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
+#ifdef WINNT
 #define NOMINMAX
+#endif
 
 #include <config_features.h>
 #include <config_folders.h>


More information about the Libreoffice-commits mailing list