fixed compile errors due to wchar redefines

git-svn-id: https://zeitsenke.de/svn/SyncEvolution/trunk@642 15ad00c4-1369-45f4-8270-35d70d36bdcd

src/vocl/posixadapter.h

@@ -27,12 +27,17 @@
 
 #include <config.h>
 #include <string.h>
+#include <wchar.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <time.h>
 #include <stdarg.h>
 
+#include <string>
+#include <cwchar>
+#include <iostream>
+
 // For ntoh functions
 #include <netinet/in.h>
 
@@ -125,8 +130,8 @@ inline char towupper(char x) { return toupper(x); }
 #undef NULL
 #define NULL 0
 
-#define min(x,y) ( (x) < (y) ? (x) : (y) )
-#define max(x,y) ( (x) > (y) ? (x) : (y) )
+template <class T> T min(T x, T y) { return x < y ? x : y; }
+template <class T> T max(T x, T y) { return x > y ? x : y; }
 
 #endif