Moved 1.9 branch to trunk

1 files changed, 20 insertions, 18 deletions

diff --git a/include/ttyio.h b/common/ttyio.h
index 2c52fc3e9..32d159863 100644
--- a/include/ttyio.h
+++ b/common/ttyio.h
@@ -1,5 +1,5 @@
 /* ttyio.h
- * Copyright (C) 1998, 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA.
  */
-#ifndef G10_TTYIO_H
-#define G10_TTYIO_H
+#ifndef GNUPG_COMMON_TTYIO_H
+#define GNUPG_COMMON_TTYIO_H
 
 #ifdef HAVE_LIBREADLINE
 #include <stdio.h>
@@ -27,23 +27,24 @@
 #endif
 
 const char *tty_get_ttyname (void);
-int tty_batchmode( int onoff );
+int tty_batchmode (int onoff);
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )
- void tty_printf (const char *fmt, ... ) __attribute__ ((format (printf,1,2)));
- void tty_fprintf (FILE *fp, const char *fmt, ... )
-                                __attribute__ ((format (printf,2,3)));
+void tty_printf (const char *fmt, ... )
+                 __attribute__ ((format (printf,1,2)));
+void tty_fprintf (FILE *fp, const char *fmt, ... )
+                 __attribute__ ((format (printf,2,3)));
 #else
- void tty_printf (const char *fmt, ... );
- void tty_fprintf (FILE *fp, const char *fmt, ... );
+void tty_printf (const char *fmt, ... );
+void tty_fprintf (FILE *fp, const char *fmt, ... );
 #endif
-void tty_print_string( const byte *p, size_t n );
-void tty_print_utf8_string( const byte *p, size_t n );
-void tty_print_utf8_string2( const byte *p, size_t n, size_t max_n );
-char *tty_get( const char *prompt );
-char *tty_get_hidden( const char *prompt );
-void tty_kill_prompt(void);
-int tty_get_answer_is_yes( const char *prompt );
-int tty_no_terminal(int onoff);
+void tty_print_string (const unsigned char *p, size_t n);
+void tty_print_utf8_string (const unsigned char *p, size_t n);
+void tty_print_utf8_string2 (const unsigned char *p, size_t n, size_t max_n);
+char *tty_get (const char *prompt);
+char *tty_get_hidden (const char *prompt);
+void tty_kill_prompt (void);
+int tty_get_answer_is_yes (const char *prompt);
+int tty_no_terminal (int onoff);
 
 #ifdef HAVE_LIBREADLINE
 void tty_enable_completion(rl_completion_func_t *completer);
@@ -56,4 +57,5 @@ void tty_disable_completion(void);
 #define tty_disable_completion()
 #endif
 
-#endif /*G10_TTYIO_H*/
+
+#endif /*GNUPG_COMMON_TTYIO_H*/