From 2dde5222175bc7b2da7256fc198c51e3a7eb3320 Mon Sep 17 00:00:00 2001
From: bernie <bernie@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Fri, 10 Feb 2006 11:30:48 +0000
Subject: [PATCH] C++ fixes.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@490 38d2e660-2303-0410-9eaa-f027e97ec537
---
 mware/hex.c | 5 +++++
 mware/msg.h | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/mware/hex.c b/mware/hex.c
index 930b0ab8..2a456021 100755
--- a/mware/hex.c
+++ b/mware/hex.c
@@ -14,10 +14,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.3  2006/02/10 11:30:48  bernie
+ *#* C++ fixes.
+ *#*
  *#* Revision 1.2  2005/03/01 23:32:05  bernie
  *#* Give due credit for this astounding creation.
  *#*
  *#*/
 
+#include "hex.h"
+
 const char hex_tab[16] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' };
 const char HEX_tab[16] = { '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F' };
diff --git a/mware/msg.h b/mware/msg.h
index f8d5b770..7411e61c 100755
--- a/mware/msg.h
+++ b/mware/msg.h
@@ -15,6 +15,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.2  2006/02/10 11:30:37  bernie
+ *#* C++ fixes.
+ *#*
  *#* Revision 1.1  2005/03/01 23:31:02  bernie
  *#* String table and localization stuff.
  *#*
@@ -35,13 +38,13 @@ enum
 #define MSG_BUFSIZE 6144 /* FIXME: how much? */
 
 /* String tables */
-extern const char *msg_strings[MSG_COUNT];
+extern const char *msg_strings const [MSG_COUNT];
 /* extern char msg_buf[MSG_BUFSIZE]; */
 
 
 /* Macros to access translated messages */
 #define MSG(x)  msg_strings[x]
-#define PTRMSG(x)  ((unsigned int)(x) < 256 ? msg_strings[(unsigned int)(x)] : (const char *)(x))
+#define PTRMSG(x)  ((x) < (const_iptr_t)256 ? msg_strings[(unsigned int)(x)] : (const char *)(x))
 
 
 #endif /* MWARE_MSG_H */
-- 
2.25.1