From 28353cd683ea50faf01e2be01bf090710a0cf56d Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 27 Oct 2012 22:41:45 +1100
Subject: [PATCH] AP_Progmem: check for PX4FMU_BUILD explicitly

---
 libraries/AP_Progmem/AP_Progmem.h          | 4 +++-
 libraries/AP_Progmem/AP_Progmem_Identity.h | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libraries/AP_Progmem/AP_Progmem.h b/libraries/AP_Progmem/AP_Progmem.h
index 19c0b8dafb..14bcda1fb3 100644
--- a/libraries/AP_Progmem/AP_Progmem.h
+++ b/libraries/AP_Progmem/AP_Progmem.h
@@ -6,8 +6,10 @@
 #include "AP_Progmem_AVR.h"
 #elif defined(DESKTOP_BUILD)
 #include "AP_Progmem_DesktopBuild.h"
-#else
+#elif defined(PX4FMU_BUILD)
 #include "AP_Progmem_Identity.h"
+#else
+#error "this build type is unknown"
 #endif
 
 #define PROGMEM_STRING(_v, _s)  static const char _v[] PROGMEM = _s
diff --git a/libraries/AP_Progmem/AP_Progmem_Identity.h b/libraries/AP_Progmem/AP_Progmem_Identity.h
index 334ff9996b..e702c309d7 100644
--- a/libraries/AP_Progmem/AP_Progmem_Identity.h
+++ b/libraries/AP_Progmem/AP_Progmem_Identity.h
@@ -6,9 +6,10 @@
 
 #define SITL_debug(fmt, args ...)
 
-typedef prog_char_t char;
+typedef char prog_char_t;
+typedef char prog_char;
 
-#define PSTR(s) s;
+#define PSTR(s) s
 
 static inline int strcasecmp_P(const char *str1, const prog_char_t *pstr)
 {
@@ -40,7 +41,7 @@ static inline char *strncpy_P(char *buffer, const prog_char_t *pstr, size_t buff
 // read something the size of a pointer. This makes the menu code more
 // portable
 static inline uintptr_t pgm_read_pointer(const void *s) {
-    return &((uintptr_t*)s)
+	return *(const uintptr_t *)s;
 }
 
 #endif // __AP_PROGMEM_IDENTITY__