From 12085b8014234b10739d5cf22ed6c6d055ce8741 Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Mon, 29 Jul 2013 16:25:20 +1000
Subject: Fix compiler warnings, operating system dependancies, and
 non-portable code.

---
 src/gdisp/mcufont/mf_encoding.h | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/gdisp/mcufont/mf_encoding.h')

diff --git a/src/gdisp/mcufont/mf_encoding.h b/src/gdisp/mcufont/mf_encoding.h
index d2673d16..d8b7b70e 100644
--- a/src/gdisp/mcufont/mf_encoding.h
+++ b/src/gdisp/mcufont/mf_encoding.h
@@ -13,7 +13,9 @@
 #define _MF_ENCODING_H_
 
 #include "mf_config.h"
+#ifndef MF_NO_STDINT_H
 #include <stdint.h>
+#endif
 
 /* Type used to represent characters internally. */
 #if MF_ENCODING == MF_ENCODING_ASCII
@@ -42,19 +44,11 @@ typedef const wchar_t * mf_str;
  * 
  * Returns: The next character, as unicode codepoint.
  */
-#if MF_ENCODING == MF_ENCODING_UTF8
 MF_EXTERN mf_char mf_getchar(mf_str *str);
-#else
-static mf_char mf_getchar(mf_str *str) { return *(*str)++; }
-#endif
 
 /* Moves back the pointer to the beginning of the previous character.
  * Be careful not to go beyond the start of the string.
  */
-#if MF_ENCODING == MF_ENCODING_UTF8
 MF_EXTERN void mf_rewind(mf_str *str);
-#else
-static void mf_rewind(mf_str *str) { (*str)--; }
-#endif
 
 #endif
-- 
cgit v1.2.3