Other warnings fixed

[Vincent Béron]

Changelog:
 - Fixed preprocessor warnings in avitools.

Vincent
-------------- next part --------------
diff -urN wine-orig/programs/avitools/aviinfo.c wine-pas-compil?/programs/avitools/aviinfo.c
--- wine-orig/programs/avitools/aviinfo.c	Sat Mar  9 19:21:18 2002
+++ wine-pas-compil?/programs/avitools/aviinfo.c	Mon May 27 15:06:01 2002
@@ -46,9 +46,9 @@
 
 #define XX(x) fn##x = (void*)GetProcAddress(avifil32,#x);assert(fn##x);
 #ifdef UNICODE
-# define XXT(x) fn##x = (void*)GetProcAddress(avifil32,#x##"W");assert(fn##x);
+# define XXT(x) fn##x = (void*)GetProcAddress(avifil32,#x"W");assert(fn##x);
 #else
-# define XXT(x) fn##x = (void*)GetProcAddress(avifil32,#x##"A");assert(fn##x);
+# define XXT(x) fn##x = (void*)GetProcAddress(avifil32,#x"A");assert(fn##x);
 #endif
 	/* Non character dependent routines: */
 	XX (AVIFileInit);
@@ -80,13 +80,13 @@
     }
     fprintf(stderr,"AVI File Info:\n");
     fprintf(stderr,"\tdwMaxBytesPerSec: %ld\n",afi.dwMaxBytesPerSec);
-#define FF(x) if (afi.dwFlags & AVIFILEINFO_##x) fprintf(stderr,#x##",");
+#define FF(x) if (afi.dwFlags & AVIFILEINFO_##x) fprintf(stderr,#x",");
     fprintf(stderr,"\tdwFlags: 0x%lx (",afi.dwFlags);
     FF(HASINDEX);FF(MUSTUSEINDEX);FF(ISINTERLEAVED);FF(WASCAPTUREFILE);
     FF(COPYRIGHTED);
     fprintf(stderr,")\n");
 #undef FF
-#define FF(x) if (afi.dwCaps & AVIFILECAPS_##x) fprintf(stderr,#x##",");
+#define FF(x) if (afi.dwCaps & AVIFILECAPS_##x) fprintf(stderr,#x",");
     fprintf(stderr,"\tdwCaps: 0x%lx (",afi.dwCaps);
     FF(CANREAD);FF(CANWRITE);FF(ALLKEYFRAMES);FF(NOCOMPRESSION);
     fprintf(stderr,")\n");
diff -urN wine-orig/programs/avitools/aviplay.c wine-pas-compil?/programs/avitools/aviplay.c
--- wine-orig/programs/avitools/aviplay.c	Sat Mar  9 19:21:18 2002
+++ wine-pas-compil?/programs/avitools/aviplay.c	Mon May 27 15:06:37 2002
@@ -77,9 +77,9 @@
 
 #define XX(x) fn##x = (void*)GetProcAddress(avifil32,#x);assert(fn##x);
 #ifdef UNICODE
-# define XXT(x) fn##x = (void*)GetProcAddress(avifil32,#x##"W");assert(fn##x);
+# define XXT(x) fn##x = (void*)GetProcAddress(avifil32,#x"W");assert(fn##x);
 #else
-# define XXT(x) fn##x = (void*)GetProcAddress(avifil32,#x##"A");assert(fn##x);
+# define XXT(x) fn##x = (void*)GetProcAddress(avifil32,#x"A");assert(fn##x);
 #endif
 	/* non character dependend routines: */
 	XX (AVIFileInit);