X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fmsg.h;h=14d4c1283076b742d90495cd683690f658c74c39;hb=45add65abd59bd79f528501c85f3e5891a9c2c29;hp=f8d5b77089e040fef0058a2ff2a73723aad7c02d;hpb=5dc6ddc46b1416e0a4b70933eb0a93ee308d09c9;p=bertos.git

diff --git a/mware/msg.h b/mware/msg.h
old mode 100755
new mode 100644
index f8d5b770..14d4c128
--- a/mware/msg.h
+++ b/mware/msg.h
@@ -1,8 +1,33 @@
 /**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2003, 2005 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \brief Definitions of constant string messages.
@@ -15,6 +40,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 +63,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 */