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

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

Conflicts:

	src/ncmpcpp.cpp

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)
 			{

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;
 }
 

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)))