From 8b071f6dc253bfdeceffd620694ea7022ecb454e Mon Sep 17 00:00:00 2001
From: "fbarchard@google.com"
 <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>
Date: Fri, 14 Oct 2011 01:19:41 +0000
Subject: [PATCH] force inline for bayer and include basic types TESTED=xcode
 build BUG=none Review URL: http://webrtc-codereview.appspot.com/233001

git-svn-id: http://libyuv.googlecode.com/svn/trunk@29 16f28f9a-4ce2-e073-06de-1de4eb20be90
---
 common/common.h   | 4 +++-
 source/convert.cc | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/common.h b/common/common.h
index 31c928164..79e9af616 100644
--- a/common/common.h
+++ b/common/common.h
@@ -29,9 +29,11 @@
 
 #endif // !ENABLE_DEBUG
 
-#ifdef __GNUC__
 // Forces compiler to inline, even against its better judgement. Use wisely.
+#if defined(__GNUC__)
 #define FORCE_INLINE __attribute__((always_inline))
+#elif defined(WIN32)
+#define FORCE_INLINE __forceinline
 #else
 #define FORCE_INLINE
 #endif
diff --git a/source/convert.cc b/source/convert.cc
index 8d6d1b1f7..ddaa51f22 100644
--- a/source/convert.cc
+++ b/source/convert.cc
@@ -10,6 +10,7 @@
 
 
 #include "convert.h"
+#include "basic_types.h"
 
 #include <string.h>     // memcpy(), memset()
 #include <assert.h>