diff --git a/ChangeLog b/ChangeLog
index 79aacc780..dd677699c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-02-11 Holger Vogt
+ * terminal.h, cpextern.h: use format (__printf__, 1, 2)
+ 
 2010-02-08 Holger Vogt
  * com_sysinfo.c: 64 bit support enabled
  * terminal.c, terminal.h, cpextern.h, ngsconvert.c, inpgmod.c, ipcsockets.c: patches by
diff --git a/src/frontend/terminal.h b/src/frontend/terminal.h
index afdf7167f..63e39f2d2 100644
--- a/src/frontend/terminal.h
+++ b/src/frontend/terminal.h
@@ -9,13 +9,7 @@ void promptreturn(void);
 void out_send(char *string);
 
 #ifdef __GNUC__
-#ifdef HAS_WINDOWS
-#undef printf
-#endif
-extern void out_printf(char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
-#ifdef HAS_WINDOWS
-#define printf		p_r_i_n_t_f
-#endif
+extern void out_printf(char *fmt, ...) __attribute__ ((format (__printf__, 1, 2)));
 #else
 extern void out_printf(char *fmt, ...);
 #endif
diff --git a/src/include/cpextern.h b/src/include/cpextern.h
index e39b29c73..a47a1b551 100644
--- a/src/include/cpextern.h
+++ b/src/include/cpextern.h
@@ -134,13 +134,7 @@ extern void out_init();
 #ifndef out_printf
 /* don't want to declare it if we have #define'ed it */
 #ifdef __GNUC__
-#ifdef HAS_WINDOWS
-#undef printf
-#endif
-extern void out_printf(char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
-#ifdef HAS_WINDOWS
-#define printf		p_r_i_n_t_f
-#endif
+extern void out_printf(char *fmt, ...) __attribute__ ((format (__printf__, 1, 2)));
 #else
 extern void out_printf(char *fmt, ...);
 #endif