From df29e91a697fbc89dea9c38282f3283e2fee7cc5 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 6 Apr 2012 04:46:47 +0000
Subject: code cleanup: header cleanup, remove commented workaround for mingw
 since its no longer needed.

---
 source/blender/imbuf/intern/imageprocess.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source/blender/imbuf')

diff --git a/source/blender/imbuf/intern/imageprocess.c b/source/blender/imbuf/intern/imageprocess.c
index 1976242ea4f..ba165d51e96 100644
--- a/source/blender/imbuf/intern/imageprocess.c
+++ b/source/blender/imbuf/intern/imageprocess.c
@@ -46,7 +46,7 @@
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
-#include "math.h"
+#include <math.h>
 
 /* This define should be relocated to a global header some where  Kent Mein 
  * I stole it from util.h in the plugins api */
-- 
cgit v1.2.3


From a0c4efa3d26c63b813ac74b124726b83517e5f28 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 12 Apr 2012 03:10:36 +0000
Subject: code cleanup: remove duplicate define on windows.

---
 source/blender/imbuf/intern/IMB_anim.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'source/blender/imbuf')

diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h
index b29d9d419e2..8724f3804d0 100644
--- a/source/blender/imbuf/intern/IMB_anim.h
+++ b/source/blender/imbuf/intern/IMB_anim.h
@@ -50,10 +50,7 @@
 
 #  undef AVIIF_KEYFRAME // redefined in AVI_avi.h
 #  undef AVIIF_LIST // redefined in AVI_avi.h
-
-#  define FIXCC(fcc)  if (fcc == 0)	fcc = mmioFOURCC('N', 'o', 'n', 'e'); \
-		if (fcc == BI_RLE8) fcc = mmioFOURCC('R', 'l', 'e', '8');
-#endif
+#endif /* _WIN32 */
 
 #include <sys/types.h>
 #include <ctype.h>
-- 
cgit v1.2.3