[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52757] trunk/lib/mingw32/openimageio/ include/OpenImageIO/osdep.h: minor change to avoid redefinition in MinGW32
Antony Riakiotakis
kalast at gmail.com
Mon Dec 3 20:36:35 CET 2012
Revision: 52757
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52757
Author: psy-fi
Date: 2012-12-03 19:36:34 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
minor change to avoid redefinition in MinGW32
Modified Paths:
--------------
trunk/lib/mingw32/openimageio/include/OpenImageIO/osdep.h
Modified: trunk/lib/mingw32/openimageio/include/OpenImageIO/osdep.h
===================================================================
--- trunk/lib/mingw32/openimageio/include/OpenImageIO/osdep.h 2012-12-03 17:53:01 UTC (rev 52756)
+++ trunk/lib/mingw32/openimageio/include/OpenImageIO/osdep.h 2012-12-03 19:36:34 UTC (rev 52757)
@@ -33,7 +33,9 @@
#ifdef _WIN32
# define WIN32_LEAN_AND_MEAN
# define VC_EXTRALEAN
+# ifndef __MINGW32__
# define NOMINMAX
+# endif
# include <windows.h>
#endif
More information about the Bf-blender-cvs
mailing list