From ad6ae59025c7bbbcabedffcb81902c3f9a683192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Tue, 8 Feb 2011 10:21:12 +0100
Subject: [PATCH] Don't use the dummy functional on windows

since MSVC headers contain all the SGI extensions we use
---
 stlport/makefile.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index c9076df16ed4..2803be6076ab 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -36,19 +36,19 @@ TARGET=so_stlport
 
 .IF "$(USE_SYSTEM_STL)"=="YES"
 
-.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
+.IF ("$(OS)"=="SOLARIS" && "$(COM)"!="GCC") | ("$(OS)"=="WNT" && "$(COM)"!="GCC")
 # System STL when building with SunStudio is just a version of STLport
 # which comes with the compiler
 all:
     @echo "Nothing to do"
-.ELSE #"$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
+.ELSE #("$(OS)"=="SOLARIS" && "$(COM)"!="GCC") | ("$(OS)"=="WNT" && "$(COM)"!="GCC")
 #
 # If you choose to build without stlport, some headers will be used to bring the
 # sgi extensions into the std namespace:
 $(INCCOM)$/stlport$/functional: systemstl$/$$(@:f)
     $(MKDIRHIER) $(@:d)
     $(COPY) $< $@
-.ENDIF #"$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
+.ENDIF #("$(OS)"=="SOLARIS" && "$(COM)"!="GCC") | ("$(OS)"=="WNT" && "$(COM)"!="GCC")
 
 .ELSE # "$(USE_SYSTEM_STL)"