Revert "Fix lwip implementation of retransmission timers."

[bertos.git] / bertos / fonts / fixed6x8.c

diff --git a/bertos/fonts/fixed6x8.c b/bertos/fonts/fixed6x8.c
index ccc4b4ec654e9b30b7489e1c7aaa1fbd6de82391..0b78ab3b81673731a4193508d6b12d28a8bb21ef 100644 (file)
--- a/bertos/fonts/fixed6x8.c
+++ b/bertos/fonts/fixed6x8.c
@@ -27,15 +27,14 @@
  * 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>
  *
  * -->
  *
  * \brief Font 8x6 IBM-PC 8bit
  *
- * \version $Id$
  *
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  *
  */
 
@@ -333,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,
@@ -340,3 +341,4 @@ struct Font default_font =
        /* .height = */ 8
 };
 
+#endif