C++ fixes.

[bertos.git] / mware / formatwr.h

diff --git a/mware/formatwr.h b/mware/formatwr.h
index 6e8ed15cadaf4c692fbbc91834cf40fa17965d01..740cb1ae7507a95abcf5f8427f3d97a983dd4c1d 100755 (executable)
--- a/mware/formatwr.h
+++ b/mware/formatwr.h
@@ -2,7 +2,7 @@
  * \file
  * <!--
  * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \version $Id$
@@ -12,6 +12,21 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.10  2005/11/04 16:20:02  bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
+ *#* Revision 1.9  2005/07/19 07:25:46  bernie
+ *#* Use appconfig.h instead of cfg/config.h.
+ *#*
+ *#* Revision 1.8  2005/04/11 19:10:28  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.7  2005/02/16 20:28:03  bernie
+ *#* Add %S formatter.
+ *#*
+ *#* Revision 1.6  2005/01/08 08:50:06  bernie
+ *#* Make more portable.
+ *#*
  *#* Revision 1.5  2004/08/25 14:12:09  rasky
  *#* Aggiornato il comment block dei log RCS
  *#*
@@ -31,8 +46,9 @@
 #ifndef MWARE_FORMATWR_H
 #define MWARE_FORMATWR_H
 
-#include <stdarg.h>
-#include <config.h>
+#include <stdarg.h> /* va_list */
+#include <appconfig.h>
+#include <cfg/cpu.h>    /* CPU_HARVARD */
 
 /*!
  * \name _formatted_write() configuration
@@ -57,14 +73,14 @@ _formatted_write(
        void *user_data,
        va_list ap);
 
-#ifdef __AVR__
-       #include <avr/pgmspace.h>
+#if CPU_HARVARD
+       #include <mware/pgm.h>
        int _formatted_write_P(
                const char * PROGMEM format,
                void put_char_func(char c, void *user_data),
                void *user_data,
                va_list ap);
-#endif /* __AVR__ */
+#endif /* CPU_HARVARD */
 
 #endif /* MWARE_FORMATWR_H */