From 42a08d0f23e7c201ceb76d30374b609ed5ebabdb Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Mon, 19 Mar 2018 16:30:58 +0100 Subject: [PATCH] remove some warning when compiling with MinGW32 --- src/help.c | 8 ++++---- src/io.c | 4 ++-- src/setup.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/help.c b/src/help.c index a736bcbc..1726672a 100644 --- a/src/help.c +++ b/src/help.c @@ -778,15 +778,15 @@ void Button_Stats(int btn) // Used memory Print_in_window(10,y,"Used memory pages: ",STATS_TITLE_COLOR,MC_Black); 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)) - 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 - 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); y+=8; -#if defined(__WIN32__) +#if defined(__WIN32__) || defined(WIN32) { ULARGE_INTEGER tailleU; GetDiskFreeSpaceExA(Main.selector.Directory,&tailleU,NULL,NULL); diff --git a/src/io.c b/src/io.c index d06af9af..40247859 100644 --- a/src/io.c +++ b/src/io.c @@ -477,10 +477,10 @@ void For_each_directory_entry(const char * directory_name, void * pdata, T_File_ int i; char short_filename[16]; 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]; 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] = '\0'; Callback( diff --git a/src/setup.c b/src/setup.c index 168aee5a..183139f2 100644 --- a/src/setup.c +++ b/src/setup.c @@ -195,7 +195,7 @@ void Set_config_directory(const char * program_dir, char * config_dir) if (!File_exists(filename)) { char *config_parent_dir; - #if defined(__WIN32__) + #if defined(__WIN32__) || defined(WIN32) // "%APPDATA%\GrafX2" const char* Config_SubDir = "GrafX2"; config_parent_dir = getenv("APPDATA");