X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Ffonts%2Ffixed6x8.c;h=0b78ab3b81673731a4193508d6b12d28a8bb21ef;hb=1a8a2b9b57118be3f52d1261ebefac3875e67bcf;hp=978cdf2ad6865035155f2cc21038abbb7aae3994;hpb=8c3c4f75ac5e265868dbeb2e4f9f1a3e1a31deff;p=bertos.git

diff --git a/bertos/fonts/fixed6x8.c b/bertos/fonts/fixed6x8.c
index 978cdf2a..0b78ab3b 100644
--- a/bertos/fonts/fixed6x8.c
+++ b/bertos/fonts/fixed6x8.c
@@ -27,18 +27,18 @@
  * the GNU General Public License.
  *
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2001 Bernardo Innocenti <bernie@codewiz.org>
+ * Copyright 2001 Bernie Innocenti <bernie@codewiz.org>
  *
  * -->
  *
- * \version $Id$
+ * \brief Font 8x6 IBM-PC 8bit
  *
- * \author Bernardo Innocenti <bernie@develer.com>
  *
- * \brief Font 8x6 IBM-PC 8bit
+ * \author Bernie Innocenti <bernie@codewiz.org>
+ *
  */
 
-#include "font.h"
+#include <gfx/font.h>
 
 static const PROGMEM uint8_t default_font_glyphs[256 * 6] =
 {
@@ -332,6 +332,8 @@ static const PROGMEM uint8_t default_font_glyphs[256 * 6] =
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00  /* ÿ */
 };
 
+
+#ifndef default_font
 struct Font default_font =
 {
 	/* .glyph = */  default_font_glyphs,
@@ -339,3 +341,4 @@ struct Font default_font =
 	/* .height = */ 8
 };
 
+#endif