Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "cosider different size of size_t type on 32bits and 64bits arches"

Browse Source 
This reverts commit 9faf3acf2f
and applies correct patch (thx for Damien Leone for pointing this)

Conflicts:

	src/ncmpcpp.cpp
This commit is contained in:
Andrzej Rybczak
2009-07-06 07:43:04 +02:00
parent 1c3cd3b90b
commit 113e54c85c
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ncmpcpp.cpp
View File

@@ -1798,7 +1798,7 @@ int main(int argc, char *argv[])
size_t number = StrToLong(wFooter->GetString()); size_t number = StrToLong(wFooter->GetString());
UnlockStatusbar(); UnlockStatusbar();
if (number && Mpd.AddRandomSongs(number)) 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) else if (myScreen == myBrowser)
{ {

2
src/window.cpp
View File

@@ -857,7 +857,7 @@ Window &Window::operator<<(const std::wstring &ws)
Window &Window::operator<<(size_t s) Window &Window::operator<<(size_t s)
{ {
wprintw(itsWindow, SIZE_T_FORMAT, s); wprintw(itsWindow, "%zu", s);
return *this; return *this;
} }

6
src/window.h
View File

@@ -32,12 +32,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
# if defined(__WORDSIZE) && __WORDSIZE == 64
# define SIZE_T_FORMAT "%lu"
#else
# define SIZE_T_FORMAT "%u"
#endif
#if defined(__GNUC__) && __GNUC__ >= 3 #if defined(__GNUC__) && __GNUC__ >= 3
# define GNUC_UNUSED __attribute__((unused)) # define GNUC_UNUSED __attribute__((unused))
# define GNUC_PRINTF(a, b) __attribute__((format(printf, a, b))) # define GNUC_PRINTF(a, b) __attribute__((format(printf, a, b)))