From 80e0b17be879c3cd943b867975c5b18620658b9b Mon Sep 17 00:00:00 2001 From: Yves Rizoud Date: Sun, 10 Apr 2011 14:35:29 +0000 Subject: [PATCH] Fix issue 430: warning 'Implicit declaration of function Remove_duplicate_shortcuts'. Fix another warning for unused parameter. Now 0 warnings on mingw32-gcc 4.4.1 git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1774 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- src/Makefile.dep | 3 ++- src/factory.c | 2 +- src/filesel.c | 4 ++-- src/filesel.h | 2 +- src/main.c | 1 + 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Makefile.dep b/src/Makefile.dep index 33532417..5a8bbedc 100644 --- a/src/Makefile.dep +++ b/src/Makefile.dep @@ -45,7 +45,8 @@ $(OBJDIR)/loadsave.o: loadsave.c buttons.h struct.h const.h errors.h global.h io engine.h brush.h setup.h $(OBJDIR)/main.o: main.c const.h struct.h global.h graph.h misc.h init.h buttons.h \ engine.h pages.h loadsave.h sdlscreen.h errors.h readini.h saveini.h \ - io.h text.h setup.h windows.h brush.h palette.h realpath.h input.h + io.h text.h setup.h windows.h brush.h palette.h realpath.h input.h \ + help.h $(OBJDIR)/misc.o: misc.c struct.h const.h sdlscreen.h global.h errors.h buttons.h \ engine.h misc.h keyboard.h windows.h palette.h input.h graph.h pages.h $(OBJDIR)/miscfileformats.o: miscfileformats.c engine.h struct.h const.h errors.h \ diff --git a/src/factory.c b/src/factory.c index 27efa774..03fe7674 100644 --- a/src/factory.c +++ b/src/factory.c @@ -1423,7 +1423,7 @@ void Highlight_script(T_Fileselector *selector, T_List_button *list, const char short index; index=Find_file_in_fileselector(selector, selected_file); - Locate_list_item(list, selector, index); + Locate_list_item(list, index); } static char Last_run_script[MAX_PATH_CHARACTERS]=""; diff --git a/src/filesel.c b/src/filesel.c index 756064f7..f0eec93c 100644 --- a/src/filesel.c +++ b/src/filesel.c @@ -1222,7 +1222,7 @@ short Quicksearch(T_Fileselector *selector) } // Translated from Highlight_file -void Locate_list_item(T_List_button * list, T_Fileselector * selector, short selected_item) +void Locate_list_item(T_List_button * list, short selected_item) { // Safety bounds @@ -1258,7 +1258,7 @@ int Quicksearch_list(T_List_button * list, T_Fileselector * selector) short selected_item=Quicksearch(selector); if (selected_item>=0 && selected_item!=list->Cursor_position+list->List_start) { - Locate_list_item(list, selector, selected_item); + Locate_list_item(list, selected_item); Hide_cursor(); // Mise à jour du scroller diff --git a/src/filesel.h b/src/filesel.h index 08956eb3..e2f9a4c1 100644 --- a/src/filesel.h +++ b/src/filesel.h @@ -50,7 +50,7 @@ void Read_list_of_drives(T_Fileselector *list, byte name_length); short Find_file_in_fileselector(T_Fileselector *list, const char * fname); -void Locate_list_item(T_List_button * list, T_Fileselector * selector, short selected_item); +void Locate_list_item(T_List_button * list, short selected_item); int Quicksearch_list(T_List_button * list, T_Fileselector * selector); diff --git a/src/main.c b/src/main.c index 36fe82fa..08685850 100644 --- a/src/main.c +++ b/src/main.c @@ -67,6 +67,7 @@ #include "palette.h" #include "realpath.h" #include "input.h" +#include "help.h" #if defined(__WIN32__) #include