From a45b610c700393ab078f715f3576b7e06e2bb36b Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Fri, 26 Sep 2008 06:36:18 +0000
Subject: [PATCH] windows: just a little cleanup

---
 desmume/src/windows/colorconv.h   | 12 ------------
 desmume/src/windows/lightView.cpp |  9 ++++++++-
 2 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 desmume/src/windows/colorconv.h

diff --git a/desmume/src/windows/colorconv.h b/desmume/src/windows/colorconv.h
deleted file mode 100644
index 6a66eb264..000000000
--- a/desmume/src/windows/colorconv.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef COLORCONV_H
-#define COLORCONV_H
-
-// Convert B5G5R5 color format into R8G8B8 color format
-unsigned int ColorConv_B5R5R5ToR8G8B8(const unsigned int color)
-{
-	return	(((color&31)<<16)<<3)		|	// red
-			((((color>>5)&31)<<8)<<3)	|	// green
-			(((color>>10)&31)<<3);			// blue
-}
-
-#endif // COLORCONV_H
diff --git a/desmume/src/windows/lightView.cpp b/desmume/src/windows/lightView.cpp
index 3d962c7c7..e5c8b8359 100644
--- a/desmume/src/windows/lightView.cpp
+++ b/desmume/src/windows/lightView.cpp
@@ -20,11 +20,18 @@
 #include "lightView.h"
 #include "commctrl.h"
 #include "colorctrl.h"
-#include "colorconv.h"
 #include "gfx3d.h"
 #include "resource.h"
 #include "debug.h"
 
+// Convert B5G5R5 color format into R8G8B8 color format
+unsigned int ColorConv_B5R5R5ToR8G8B8(const unsigned int color)
+{
+	return	(((color&31)<<16)<<3)		|	// red
+			((((color>>5)&31)<<8)<<3)	|	// green
+			(((color>>10)&31)<<3);			// blue
+}
+
 typedef struct
 {
 	u32	autoup_secs;