diff options
| author | Andrzej Rybczak <electricityispower@gmail.com> | 2009-07-06 07:43:04 +0200 |
|---|---|---|
| committer | Andrzej Rybczak <electricityispower@gmail.com> | 2009-07-06 07:43:04 +0200 |
| commit | 113e54c85c87786cbf08b44b6cce207c9c3a6112 (patch) | |
| tree | e574ba88905244fc5e0ad91285d17237551fdeb3 | |
| parent | 1c3cd3b90b34770156a1fc1f80b124dc74530227 (diff) | |
Revert "cosider different size of size_t type on 32bits and 64bits arches"
This reverts commit 9faf3acf2f1bef0d10fdf85ce93468800916ae66
and applies correct patch (thx for Damien Leone for pointing this)
Conflicts:
src/ncmpcpp.cpp
| -rw-r--r-- | src/ncmpcpp.cpp | 2 | ||||
| -rw-r--r-- | src/window.cpp | 2 | ||||
| -rw-r--r-- | src/window.h | 6 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp index e5781005..aba2e8c6 100644 --- a/src/ncmpcpp.cpp +++ b/src/ncmpcpp.cpp @@ -1798,7 +1798,7 @@ int main(int argc, char *argv[]) size_t number = StrToLong(wFooter->GetString()); UnlockStatusbar(); if (number && Mpd.AddRandomSongs(number)) - ShowMessage(SIZE_T_FORMAT " random song%s added to playlist!", number, number == 1 ? "" : "s"); + ShowMessage("%zu 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 46ac98a5..a8d61aa9 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -857,7 +857,7 @@ Window &Window::operator<<(const std::wstring &ws) Window &Window::operator<<(size_t s) { - wprintw(itsWindow, SIZE_T_FORMAT, s); + wprintw(itsWindow, "%zu", s); return *this; } diff --git a/src/window.h b/src/window.h index b2a9cdd1..dcf7b9f7 100644 --- a/src/window.h +++ b/src/window.h @@ -32,12 +32,6 @@ #include <vector> #include <string> -# 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))) |