From a95babbf381faac591ef74244aba6b399448c653 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 2 Mar 2012 12:56:50 +0000 Subject: [PATCH] gdb/ Fix -Wmissing-prototypes build. * charset.c (phony_iconv_open): Make static. (phony_iconv_close, phony_iconv): Likewise. * i386-linux-nat.c (_initialize_i386_linux_nat): New prototype. * i386-windows-nat.c (_initialize_i386_windows_nat): New prototype. * mingw-hdep.c (_initialize_mingw_hdep): New prototype. * ser-mingw.c (create_select_thread): Make static. * windows-termcap.c (tgetent): New prototype. (tgetnum, tgetflag, tgetstr, tputs, tgoto): Likewise. --- gdb/ChangeLog | 13 +++++++++++++ gdb/charset.c | 6 +++--- gdb/i386-linux-nat.c | 3 +++ gdb/i386-windows-nat.c | 3 +++ gdb/mingw-hdep.c | 3 +++ gdb/ser-mingw.c | 2 +- gdb/windows-termcap.c | 8 ++++++++ 7 files changed, 34 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index dc324ddab72..fbb62a7eabc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2012-03-02 Yao Qi + + Fix -Wmissing-prototypes build. + * charset.c (phony_iconv_open): Make static. + (phony_iconv_close, phony_iconv): Likewise. + * i386-linux-nat.c (_initialize_i386_linux_nat): New prototype. + * i386-windows-nat.c (_initialize_i386_windows_nat): New + prototype. + * mingw-hdep.c (_initialize_mingw_hdep): New prototype. + * ser-mingw.c (create_select_thread): Make static. + * windows-termcap.c (tgetent): New prototype. + (tgetnum, tgetflag, tgetstr, tputs, tgoto): Likewise. + 2012-03-02 Zhang Yuanhui Fix -Wmissing-prototypes build. diff --git a/gdb/charset.c b/gdb/charset.c index 16dab6b9fc0..4a209a553cb 100644 --- a/gdb/charset.c +++ b/gdb/charset.c @@ -108,7 +108,7 @@ #define EILSEQ ENOENT #endif -iconv_t +static iconv_t phony_iconv_open (const char *to, const char *from) { /* We allow conversions from UTF-32BE, wchar_t, and the host charset. @@ -124,13 +124,13 @@ phony_iconv_open (const char *to, const char *from) return !strcmp (from, "UTF-32BE"); } -int +static int phony_iconv_close (iconv_t arg) { return 0; } -size_t +static size_t phony_iconv (iconv_t utf_flag, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) { diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c index 38e70276d49..ac1629ac795 100644 --- a/gdb/i386-linux-nat.c +++ b/gdb/i386-linux-nat.c @@ -1008,6 +1008,9 @@ i386_linux_read_description (struct target_ops *ops) return tdesc_i386_linux; } +/* -Wmissing-prototypes */ +extern initialize_file_ftype _initialize_i386_linux_nat; + void _initialize_i386_linux_nat (void) { diff --git a/gdb/i386-windows-nat.c b/gdb/i386-windows-nat.c index 9c467fb6098..5d93915a72a 100644 --- a/gdb/i386-windows-nat.c +++ b/gdb/i386-windows-nat.c @@ -70,6 +70,9 @@ static const int mappings[] = }; #undef context_offset +/* -Wmissing-prototypes */ +extern initialize_file_ftype _initialize_i386_windows_nat; + void _initialize_i386_windows_nat (void) { diff --git a/gdb/mingw-hdep.c b/gdb/mingw-hdep.c index 331708f9d54..ed06c5661f5 100644 --- a/gdb/mingw-hdep.c +++ b/gdb/mingw-hdep.c @@ -251,6 +251,9 @@ gdb_call_async_signal_handler (struct async_signal_handler *handler, SetEvent (sigint_event); } +/* -Wmissing-prototypes */ +extern initialize_file_ftype _initialize_mingw_hdep; + void _initialize_mingw_hdep (void) { diff --git a/gdb/ser-mingw.c b/gdb/ser-mingw.c index d862868984a..cf7c8b7fdec 100644 --- a/gdb/ser-mingw.c +++ b/gdb/ser-mingw.c @@ -428,7 +428,7 @@ typedef DWORD WINAPI (*thread_fn_type)(void *); /* Create a new select thread for SCB executing THREAD_FN. The STATE will be filled in by this function before return. */ -void +static void create_select_thread (thread_fn_type thread_fn, struct serial *scb, struct ser_console_state *state) diff --git a/gdb/windows-termcap.c b/gdb/windows-termcap.c index a70b6e8416a..7f946ea0a8b 100644 --- a/gdb/windows-termcap.c +++ b/gdb/windows-termcap.c @@ -21,6 +21,14 @@ #include +/* -Wmissing-prototypes */ +extern int tgetent (char *buffer, char *termtype); +extern int tgetnum (char *name); +extern int tgetflag (char *name); +extern char* tgetstr (char *name, char **area); +extern int tputs (char *string, int nlines, int (*outfun) ()); +extern char *tgoto (const char *cap, int col, int row); + /* Each of the files below is a minimal implementation of the standard termcap function with the same name, suitable for use in a Windows console window. */ -- 2.30.2