Fixed compilation warnings: a few missing declarations, and 2 strange casts on WIN32-specific code.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1712 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2011-02-07 19:39:45 +00:00
parent fdb925979e
commit ce3181b230
5 changed files with 12 additions and 8 deletions

View File

@ -23,7 +23,8 @@ $(OBJDIR)/filesel.o: filesel.c const.h struct.h global.h misc.h errors.h io.h \
help.h filesel.h help.h filesel.h
$(OBJDIR)/graph.o: graph.c global.h struct.h const.h engine.h buttons.h pages.h \ $(OBJDIR)/graph.o: graph.c global.h struct.h const.h engine.h buttons.h pages.h \
errors.h sdlscreen.h graph.h misc.h pxsimple.h pxtall.h pxwide.h \ errors.h sdlscreen.h graph.h misc.h pxsimple.h pxtall.h pxwide.h \
pxdouble.h pxtriple.h pxwide2.h pxtall2.h pxquad.h windows.h input.h pxdouble.h pxtriple.h pxwide2.h pxtall2.h pxquad.h windows.h input.h \
brush.h
$(OBJDIR)/help.o: help.c const.h struct.h global.h misc.h engine.h helpfile.h \ $(OBJDIR)/help.o: help.c const.h struct.h global.h misc.h engine.h helpfile.h \
help.h sdlscreen.h text.h keyboard.h windows.h input.h hotkeys.h \ help.h sdlscreen.h text.h keyboard.h windows.h input.h hotkeys.h \
errors.h pages.h errors.h pages.h
@ -31,7 +32,7 @@ $(OBJDIR)/hotkeys.o: hotkeys.c struct.h const.h global.h hotkeys.h
$(OBJDIR)/init.o: init.c buttons.h struct.h const.h errors.h global.h graph.h \ $(OBJDIR)/init.o: init.c buttons.h struct.h const.h errors.h global.h graph.h \
init.h io.h factory.h help.h hotkeys.h keyboard.h loadsave.h misc.h \ init.h io.h factory.h help.h hotkeys.h keyboard.h loadsave.h misc.h \
mountlist.h operatio.h palette.h sdlscreen.h setup.h transform.h \ mountlist.h operatio.h palette.h sdlscreen.h setup.h transform.h \
windows.h layers.h windows.h layers.h special.h
$(OBJDIR)/input.o: input.c global.h struct.h const.h keyboard.h sdlscreen.h \ $(OBJDIR)/input.o: input.c global.h struct.h const.h keyboard.h sdlscreen.h \
windows.h errors.h misc.h buttons.h input.h loadsave.h windows.h errors.h misc.h buttons.h input.h loadsave.h
$(OBJDIR)/io.o: io.c struct.h const.h io.h realpath.h $(OBJDIR)/io.o: io.c struct.h const.h io.h realpath.h

View File

@ -129,10 +129,6 @@ void Bouton_***(void)
} }
*/ */
void Select_paintbrush(int index);
byte Store_paintbrush(int index);
void Message_out_of_memory(void) void Message_out_of_memory(void)
{ {
short clicked_button; short clicked_button;

View File

@ -670,5 +670,9 @@ void Button_Smear_mode(void);
void Button_Brush_container(void); void Button_Brush_container(void);
byte Store_paintbrush(int index);
void Select_paintbrush(int index);
#endif #endif

View File

@ -48,6 +48,7 @@
#include "pxquad.h" #include "pxquad.h"
#include "windows.h" #include "windows.h"
#include "input.h" #include "input.h"
#include "brush.h"
#ifdef __VBCC__ #ifdef __VBCC__
#define __attribute__(x) #define __attribute__(x)

View File

@ -83,6 +83,8 @@
#include "transform.h" #include "transform.h"
#include "windows.h" #include "windows.h"
#include "layers.h" #include "layers.h"
#include "special.h"
#include "buttons.h"
char Gui_loading_error_message[512]; char Gui_loading_error_message[512];
@ -2889,7 +2891,7 @@ void Define_icon(void)
// Find the bits for the nID icon. // Find the bits for the nID icon.
hresource = FindResource(hInstance, hresource = FindResource(hInstance,
MAKEINTRESOURCE(nID), MAKEINTRESOURCE(nID),
MAKEINTRESOURCE(RT_ICON)); MAKEINTRESOURCE((long)RT_ICON));
if (hresource==NULL) if (hresource==NULL)
break; break;
@ -2925,7 +2927,7 @@ void Define_icon(void)
// Find the bits for the nID icon. // Find the bits for the nID icon.
hresource = FindResource(hInstance, hresource = FindResource(hInstance,
MAKEINTRESOURCE(nID), MAKEINTRESOURCE(nID),
MAKEINTRESOURCE(RT_ICON)); MAKEINTRESOURCE((long)RT_ICON));
if (hresource==NULL) if (hresource==NULL)
break; break;