From 9faf3acf2f1bef0d10fdf85ce93468800916ae66 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Fri, 3 Jul 2009 04:34:25 +0200 Subject: [PATCH] cosider different size of size_t type on 32bits and 64bits arches --- src/ncmpcpp.cpp | 2 +- src/window.cpp | 2 +- src/window.h | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp index 46c82d4b..3b43f571 100644 --- a/src/ncmpcpp.cpp +++ b/src/ncmpcpp.cpp @@ -1789,7 +1789,7 @@ int main(int argc, char *argv[]) size_t number = StrToLong(wFooter->GetString()); UnlockStatusbar(); if (number && Mpd->AddRandomSongs(number)) - ShowMessage("%lu random song%s added to playlist!", number, number == 1 ? "" : "s"); + ShowMessage(SIZE_T_FORMAT " random song%s added to playlist!", number, number == 1 ? "" : "s"); } else if (myScreen == myBrowser) { diff --git a/src/window.cpp b/src/window.cpp index 834b36ca..7804a7ba 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -860,7 +860,7 @@ Window &Window::operator<<(const wstring &ws) Window &Window::operator<<(size_t s) { - wprintw(itsWindow, "%u", s); + wprintw(itsWindow, SIZE_T_FORMAT, s); return *this; } diff --git a/src/window.h b/src/window.h index dcf7b9f7..b2a9cdd1 100644 --- a/src/window.h +++ b/src/window.h @@ -32,6 +32,12 @@ #include #include +# if defined(__WORDSIZE) && __WORDSIZE == 64 +# define SIZE_T_FORMAT "%lu" +#else +# define SIZE_T_FORMAT "%u" +#endif + #if defined(__GNUC__) && __GNUC__ >= 3 # define GNUC_UNUSED __attribute__((unused)) # define GNUC_PRINTF(a, b) __attribute__((format(printf, a, b)))