m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove some warning when compiling with MinGW32

Browse Source
This commit is contained in:
Thomas Bernard 2018-03-19 16:30:58 +01:00
parent bae93cba7a
commit 42a08d0f23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/help.c
View File

@ -778,15 +778,15 @@ void Button_Stats(int btn)
// Used memory // Used memory
Print_in_window(10,y,"Used memory pages: ",STATS_TITLE_COLOR,MC_Black); Print_in_window(10,y,"Used memory pages: ",STATS_TITLE_COLOR,MC_Black);
if(Stats_pages_memory > (100LL*1024*1024*1024)) if(Stats_pages_memory > (100LL*1024*1024*1024))
sprintf(buffer,"%ld (%lld Gb)",Stats_pages_number, Stats_pages_memory/(1024*1024*1024)); sprintf(buffer,"%ld (%ld Gb)",Stats_pages_number, (long)(Stats_pages_memory/(1024*1024*1024)));
else if(Stats_pages_memory > (100*1024*1024)) else if(Stats_pages_memory > (100*1024*1024))
sprintf(buffer,"%ld (%lld Mb)",Stats_pages_number, Stats_pages_memory/(1024*1024)); sprintf(buffer,"%ld (%ld Mb)",Stats_pages_number, (long)(Stats_pages_memory/(1024*1024)));
else else
sprintf(buffer,"%ld (%lld Kb)",Stats_pages_number, Stats_pages_memory/1024); sprintf(buffer,"%ld (%ld Kb)",Stats_pages_number, (long)(Stats_pages_memory/1024));
Print_in_window(162,y,buffer,STATS_DATA_COLOR,MC_Black); Print_in_window(162,y,buffer,STATS_DATA_COLOR,MC_Black);
y+=8; y+=8;
#if defined(__WIN32__) #if defined(__WIN32__) || defined(WIN32)
{ {
ULARGE_INTEGER tailleU; ULARGE_INTEGER tailleU;
GetDiskFreeSpaceExA(Main.selector.Directory,&tailleU,NULL,NULL); GetDiskFreeSpaceExA(Main.selector.Directory,&tailleU,NULL,NULL);

4
src/io.c
View File

@ -477,10 +477,10 @@ void For_each_directory_entry(const char * directory_name, void * pdata, T_File_
int i; int i;
char short_filename[16]; char short_filename[16];
if (fd.cAlternateFileName[0] != 0) if (fd.cAlternateFileName[0] != 0)
for (i = 0; fd.cAlternateFileName[i] != 0 && i < sizeof(short_filename) - 1; i++) for (i = 0; fd.cAlternateFileName[i] != 0 && i < (int)sizeof(short_filename) - 1; i++)
short_filename[i] = (char)fd.cAlternateFileName[i]; short_filename[i] = (char)fd.cAlternateFileName[i];
else // normal name is short ! else // normal name is short !
for (i = 0; fd.cFileName[i] != 0 && i < sizeof(short_filename) - 1; i++) for (i = 0; fd.cFileName[i] != 0 && i < (int)sizeof(short_filename) - 1; i++)
short_filename[i] = (char)fd.cFileName[i]; short_filename[i] = (char)fd.cFileName[i];
short_filename[i] = '\0'; short_filename[i] = '\0';
Callback( Callback(

2
src/setup.c
View File

@ -195,7 +195,7 @@ void Set_config_directory(const char * program_dir, char * config_dir)
if (!File_exists(filename)) if (!File_exists(filename))
{ {
char *config_parent_dir; char *config_parent_dir;
#if defined(__WIN32__) #if defined(__WIN32__) || defined(WIN32)
// "%APPDATA%\GrafX2" // "%APPDATA%\GrafX2"
const char* Config_SubDir = "GrafX2"; const char* Config_SubDir = "GrafX2";
config_parent_dir = getenv("APPDATA"); config_parent_dir = getenv("APPDATA");