diff options
author | Eric Wong <normalperson@yhbt.net> | 2008-09-29 02:35:09 -0700 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2008-09-29 04:05:48 -0700 |
commit | fcbcdd9869e3147fe4a30ba808af294f680c9373 (patch) | |
tree | ccc1799d04cbf2501032107384a81094e18c615a /src/playlist.c | |
parent | c7930c993e4624e4e6d9a50cdea448b432a2bf05 (diff) | |
download | mpd-fcbcdd9869e3147fe4a30ba808af294f680c9373.tar.gz mpd-fcbcdd9869e3147fe4a30ba808af294f680c9373.tar.xz mpd-fcbcdd9869e3147fe4a30ba808af294f680c9373.zip |
Switch to C99 types (retaining compat with old compilers)
Seeing the "mpd_" prefix _everywhere_ is mind-numbing as the
mind needs to retrain itself to skip over the first 4 tokens of
a type to get to its meaning. So avoid having extra characters
on my terminal to make it easier to follow code at 2:30 am in
the morning.
Please report any new issues you may come across on Free
toolchains. I realize how difficult it can be to build/maintain
cross-compiling toolchains and I have no intention of forcing
people to upgrade their toolchains to build mpd.
Tested with gcc 2.95.4 and and gcc 4.3.1 on x86-32.
Diffstat (limited to '')
-rw-r--r-- | src/playlist.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/playlist.c b/src/playlist.c index af0aaccc0..ca903036d 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -43,7 +43,7 @@ static enum _playlist_state playlist_state; struct _playlist { Song **songs; /* holds version a song was modified on */ - mpd_uint32 *songMod; + uint32_t *songMod; int *order; int *positionToId; int *idToPosition; @@ -52,7 +52,7 @@ struct _playlist { int queued; /* to be decoded */ int repeat; int random; - mpd_uint32 version; + uint32_t version; }; #define PLAYLIST_PREV_UNLESS_ELAPSED 10 @@ -99,7 +99,7 @@ static void randomizeOrder(int start, int end); static void incrPlaylistVersion(void) { - static unsigned long max = ((mpd_uint32) 1 << 31) - 1; + static unsigned long max = ((uint32_t) 1 << 31) - 1; playlist.version++; if (playlist.version >= max) { int i; @@ -167,7 +167,7 @@ void initPlaylist(void) DEFAULT_PLAYLIST_SAVE_ABSOLUTE_PATHS; playlist.songs = xmalloc(sizeof(Song *) * playlist_max_length); - playlist.songMod = xmalloc(sizeof(mpd_uint32) * playlist_max_length); + playlist.songMod = xmalloc(sizeof(uint32_t) * playlist_max_length); playlist.order = xmalloc(sizeof(int) * playlist_max_length); playlist.idToPosition = xmalloc(sizeof(int) * playlist_max_length * PLAYLIST_HASH_MULT); @@ -381,7 +381,7 @@ static void printPlaylistSongInfo(int fd, int song) fdprintf(fd, "Pos: %i\nId: %i\n", song, playlist.positionToId[song]); } -int playlistChanges(int fd, mpd_uint32 version) +int playlistChanges(int fd, uint32_t version) { int i; @@ -396,7 +396,7 @@ int playlistChanges(int fd, mpd_uint32 version) return 0; } -int playlistChangesPosId(int fd, mpd_uint32 version) +int playlistChangesPosId(int fd, uint32_t version) { int i; |