--- lib/metadata.cpp.orig	Wed Nov 10 17:37:26 2004

+++ lib/metadata.cpp	Wed Sep 14 17:25:59 2005

@@ -34,6 +34,14 @@

    #include "astrcmp.h"

 }

+#ifndef min

+#define min(a,b) ((a) < (b) ? (a) : (b))

+#endif

+

+#ifndef max

+#define max(a,b) ((a) > (b) ? (a) : (b))

+#endif

+

 const int numAlbumTypeStrings = 11;

 const char *albumTypeStrings[] =

 {

--- lib/utf8/utf8util.cpp.orig	Mon Jul 11 05:01:23 2005

+++ lib/utf8/utf8util.cpp	Wed Sep 14 17:19:42 2005

@@ -38,7 +38,7 @@

     char *dest;

     string to;

-    to.clear();

+    to = "";

     ret = utf8_encode(from.c_str(), &dest);

     if (ret >= 0)

     {

@@ -54,7 +54,7 @@

     char *dest;

     string to;

-    to.clear();

+    to = "";

     ret = utf8_decode(from.c_str(), &dest);

     if (ret >= 0)

     {

--- plugins/flac/flac.cpp.orig	Tue Jun 28 13:03:06 2005

+++ plugins/flac/flac.cpp	Wed Sep 14 17:35:23 2005

@@ -33,7 +33,10 @@

 #ifdef WIN32

 #include <winsock.h>

 #else

+#include <sys/types.h>

+#include <sys/socket.h>

 #include <netinet/in.h>

+#include <arpa/inet.h>

 #include <sys/param.h>

 #endif

--- plugins/mp3/mp3.cpp.orig	Tue Jul 12 06:44:06 2005

+++ plugins/mp3/mp3.cpp	Wed Sep 14 17:32:42 2005

@@ -33,7 +33,10 @@

 #ifdef WIN32

 #include <winsock.h>

 #else

+#include <sys/types.h>

+#include <sys/socket.h>

 #include <netinet/in.h>

+#include <arpa/inet.h>

 #include <sys/param.h>

 #endif

--- plugins/vorbis/vorbis.cpp.orig	Tue Jun 28 13:03:06 2005

+++ plugins/vorbis/vorbis.cpp	Wed Sep 14 17:34:12 2005

@@ -33,7 +33,10 @@

 #ifdef WIN32

 #include <winsock.h>

 #else

+#include <sys/types.h>

+#include <sys/socket.h>

 #include <netinet/in.h>

+#include <arpa/inet.h>

 #include <sys/param.h>

 #endif

--- plugins/wav/wav.cpp.orig	Wed Jun 15 06:15:18 2005

+++ plugins/wav/wav.cpp	Wed Sep 14 17:30:30 2005

@@ -34,7 +34,10 @@

 #ifdef WIN32

 #include <winsock.h>

 #else

+#include <sys/types.h>

+#include <sys/socket.h>

 #include <netinet/in.h>

+#include <arpa/inet.h>

 #include <sys/param.h>

 #endif