Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2009-04-05 20:20:41 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2009-04-05 20:20:41 +0400
commit6225d2d3f904bd8725fc86c6c2b6c78a479f89e8 (patch)
tree7c70638462509e6560d0ab062afe57cc6e403ec4 /source/blender/freestyle/intern
parent2f5e1969ed6f976930fef2e5e83df80979e22a88 (diff)
Tweaked a preprocessor conditional statement to support MinGW
(tested with gcc version 3.4.5 (mingw-vista special r3), SCons 1.2.0, and Python 2.5.2).
Diffstat (limited to 'source/blender/freestyle/intern')
-rw-r--r--source/blender/freestyle/intern/app_blender/AppView.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/app_blender/AppView.h b/source/blender/freestyle/intern/app_blender/AppView.h
index 4b7207da1fd..b6a5dfcf1cc 100644
--- a/source/blender/freestyle/intern/app_blender/AppView.h
+++ b/source/blender/freestyle/intern/app_blender/AppView.h
@@ -1,7 +1,7 @@
#ifndef APPVIEW_H
# define APPVIEW_H
-# ifndef WIN32
+# if !defined(WIN32) || defined(__GNUC__)
# include <algorithm>
using namespace std;
# define __min(x,y) (min(x,y))