diff -Naur id3lib-3.8.3-orig/configure id3lib-3.8.3/configure --- id3lib-3.8.3-orig/configure 2008-05-24 23:39:36.000000000 -0400 +++ id3lib-3.8.3/configure 2008-05-24 23:39:57.000000000 -0400 @@ -10296,8 +10296,7 @@ for ac_header in \ string \ - iomanip.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` diff -Naur id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h --- id3lib-3.8.3-orig/include/id3/id3lib_strings.h 2008-03-05 18:19:46.000000000 -0600 +++ id3lib-3.8.3/include/id3/id3lib_strings.h 2008-03-05 18:19:38.000000000 -0600 @@ -30,6 +30,7 @@ #define _ID3LIB_STRINGS_H_ #include <string> +#include <cstring> #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) namespace std diff -Naur id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h --- id3lib-3.8.3-orig/include/id3/writers.h 2003-03-01 18:23:00.000000000 -0600 +++ id3lib-3.8.3/include/id3/writers.h 2008-03-05 18:23:05.000000000 -0600 @@ -30,7 +30,7 @@ #include "id3/writer.h" #include "id3/id3lib_streams.h" -//#include <string.h> +#include <string.h> class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer { diff -Naur id3lib-3.8.3-orig/examples/demo_convert.cpp id3lib-3.8.3/examples/demo_convert.cpp --- id3lib-3.8.3-orig/examples/demo_convert.cpp 2003-03-01 18:23:00.000000000 -0600 +++ id3lib-3.8.3/examples/demo_convert.cpp 2008-03-05 18:26:50.000000000 -0600 @@ -84,7 +84,7 @@ } } -int main( unsigned int argc, char * const argv[]) +int main( int argc, char * const argv[]) { flags_t ulFlag = ID3TT_ALL; gengetopt_args_info args; diff -Naur id3lib-3.8.3-orig/examples/demo_info.cpp id3lib-3.8.3/examples/demo_info.cpp --- id3lib-3.8.3-orig/examples/demo_info.cpp 2003-03-01 18:23:00.000000000 -0600 +++ id3lib-3.8.3/examples/demo_info.cpp 2008-03-05 18:27:40.000000000 -0600 @@ -309,7 +309,7 @@ #define DEBUG -int main( unsigned int argc, char * const argv[]) +int main( int argc, char * const argv[]) { ID3D_INIT_DOUT(); diff -Naur id3lib-3.8.3-orig/examples/demo_tag.cpp id3lib-3.8.3/examples/demo_tag.cpp --- id3lib-3.8.3-orig/examples/demo_tag.cpp 2003-03-01 18:23:00.000000000 -0600 +++ id3lib-3.8.3/examples/demo_tag.cpp 2008-03-05 18:31:20.000000000 -0600 @@ -46,7 +46,7 @@ os << "v2"; } -int main( unsigned int argc, char * const argv[]) +int main( int argc, char * const argv[]) { int ulFlag = ID3TT_ID3; ID3D_INIT_DOUT(); diff -Naur id3lib-3.8.3-orig/examples/demo_copy.cpp id3lib-3.8.3/examples/demo_copy.cpp --- id3lib-3.8.3-orig/examples/demo_copy.cpp 2003-03-01 18:23:00.000000000 -0600 +++ id3lib-3.8.3/examples/demo_copy.cpp 2008-03-05 18:32:44.000000000 -0600 @@ -81,7 +81,7 @@ } } -int main( unsigned int argc, char * const argv[]) +int main( int argc, char * const argv[]) { int ulFlag = ID3TT_ID3; ID3D_INIT_DOUT();