From fdec74b87a47ef7332ad805a89402b4032efd557 Mon Sep 17 00:00:00 2001
From: MattTuttle <heardtheword@gmail.com>
Date: Tue, 8 Jul 2014 15:55:03 -0500
Subject: [PATCH] Preventing duplicate objects error in ByteArray.h

---
 project/include/utils/ByteArray.h       | 23 +----------------------
 project/src/backend/sdl/SDLRenderer.cpp |  2 +-
 project/src/utils/ByteArray.cpp         | 25 +------------------------
 3 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/project/include/utils/ByteArray.h b/project/include/utils/ByteArray.h
index 8450f8dc4..38d2ac1db 100644
--- a/project/include/utils/ByteArray.h
+++ b/project/include/utils/ByteArray.h
@@ -67,28 +67,7 @@ namespace lime {
 	extern int gFixedOrientation;
 
 	#elif defined(HX_MACOS)
-	#include <CoreFoundation/CoreFoundation.h>
-	FILE *OpenRead(const char *inName)
-	{
-		FILE *result = fopen(inName,"rb");
-		if (!result) {
-			CFStringRef str = CFStringCreateWithCString(NULL, inName, kCFStringEncodingUTF8);
-			CFURLRef path = CFBundleCopyResourceURL(CFBundleGetMainBundle(), str, NULL, NULL);
-			CFRelease(str);
-			if (path) {
-				str = CFURLCopyPath(path);
-				CFIndex maxSize = CFStringGetMaximumSizeForEncoding(CFStringGetLength(str),kCFStringEncodingUTF8);
-				char *buffer = (char *)malloc(maxSize);
-				if (CFStringGetCString(str, buffer, maxSize, kCFStringEncodingUTF8)) {
-					result = fopen(buffer,"rb");
-					free(buffer);
-				}
-				CFRelease(str);
-				CFRelease(path);
-			}
-		}
-		return result;
-	}
+	FILE *OpenRead(const char *inName);
 	#define OpenOverwrite(x) fopen(x,"wb")
 	#else
 	#ifdef TIZEN
diff --git a/project/src/backend/sdl/SDLRenderer.cpp b/project/src/backend/sdl/SDLRenderer.cpp
index 9c3353139..ff1781f89 100644
--- a/project/src/backend/sdl/SDLRenderer.cpp
+++ b/project/src/backend/sdl/SDLRenderer.cpp
@@ -1,6 +1,6 @@
 #include "SDLWindow.h"
 #include "SDLRenderer.h"
-#include "../../graphics/opengl/OpenGLBindings.h"
+#include "../../graphics/OpenGLBindings.h"
 
 
 namespace lime {
diff --git a/project/src/utils/ByteArray.cpp b/project/src/utils/ByteArray.cpp
index 3235bd485..061536cba 100644
--- a/project/src/utils/ByteArray.cpp
+++ b/project/src/utils/ByteArray.cpp
@@ -113,22 +113,7 @@ namespace lime {
     } DEFINE_PRIM(lime_byte_array_get_native_pointer,1);
     
     
-    #ifdef HX_WINDOWS
-typedef wchar_t OSChar;
-#define val_os_string val_wstring
-#define OpenRead(x) _wfopen(x,L"rb")
-#define OpenOverwrite(x) _wfopen(x,L"wb") // [ddc]
-
-#else
-typedef char OSChar;
-#define val_os_string val_string
-
-#if defined(IPHONE)
-FILE *OpenRead(const char *inName);
-FILE *OpenOverwrite(const char *inName); // [ddc]
-extern int gFixedOrientation;
-
-#elif defined(HX_MACOS)
+#if defined(HX_MACOS)
 #include <CoreFoundation/CoreFoundation.h>
 FILE *OpenRead(const char *inName)
 {
@@ -151,14 +136,6 @@ FILE *OpenRead(const char *inName)
 	}
 	return result;
 }
-#define OpenOverwrite(x) fopen(x,"wb")
-#else
-#ifdef TIZEN
-extern int gFixedOrientation;
-#endif
-#define OpenRead(x) fopen(x,"rb")
-#define OpenOverwrite(x) fopen(x,"wb") // [ddc]
-#endif
 #endif