Index: mppenc/branches/r2d/src/Makefile.am
===================================================================
--- mppenc/branches/r2d/src/Makefile.am	(revision 71)
+++ mppenc/branches/r2d/src/Makefile.am	(revision 72)
@@ -12,2 +12,3 @@
 mppenc_LDADD = $(top_builddir)/libmpcpsy/libmpcpsy.a \
 	$(top_builddir)/libmpcenc/libmpcenc.a -lm
+AM_CFLAGS = -DMPP_ENCODER=1 -DTRUE=1 -DFALSE=0
Index: mppenc/branches/r2d/src/mppdec.h
===================================================================
--- mppenc/branches/r2d/src/mppdec.h	(revision 71)
+++ mppenc/branches/r2d/src/mppdec.h	(revision 72)
@@ -1051,12 +1051,13 @@
 
 // tools.c
-size_t     Read_LittleEndians         ( FILE_T fp, Uint32_t* dst, size_t words32bit );
-void       Requantize_MidSideStereo   ( Int Stop_Band, const Bool_t* used_MS );
-void       Requantize_IntensityStereo ( Int Start_Band, Int Stop_Band );
-// void       Resort_HuffTable           ( Huffman_t* const Table, const size_t elements, Int offset );
-// void       Make_HuffTable             ( Huffman_t* dst, const HuffSrc_t* src, size_t len );
-// void       Make_LookupTable           ( Uint8_t* LUT, size_t LUT_len, const Huffman_t* const Table, const size_t elements );
-size_t     complete_read              ( int fd, void* dest, size_t bytes );
-int        isdir                      ( const char* Name );
+// size_t     Read_LittleEndians         ( FILE_T fp, Uint32_t* dst, size_t words32bit );
+// void       Requantize_MidSideStereo   ( Int Stop_Band, const Bool_t* used_MS );
+// void       Requantize_IntensityStereo ( Int Start_Band, Int Stop_Band );
+// // void       Resort_HuffTable           ( Huffman_t* const Table, const size_t elements, Int offset );
+// // void       Make_HuffTable             ( Huffman_t* dst, const HuffSrc_t* src, size_t len );
+// // void       Make_LookupTable           ( Uint8_t* LUT, size_t LUT_len, const Huffman_t* const Table, const size_t elements );
+// size_t     complete_read              ( int fd, void* dest, size_t bytes );
+// int        isdir                      ( const char* Name );
+// FIXME : what is this ? where does it go ?
 void       Init_FPU                   ( void );
 
Index: mppenc/branches/r2d/src/wave_in.c
===================================================================
--- mppenc/branches/r2d/src/wave_in.c	(revision 71)
+++ mppenc/branches/r2d/src/wave_in.c	(revision 72)
@@ -20,4 +20,5 @@
 #include "mppenc.h"
 
+#ifdef _WIN32
 
 static int
@@ -28,4 +29,6 @@
 static size_t
 get_in ( void* DataPtr );
+
+#endif