Fix build problems in uClibc with gcc 3.3.
Submitted by Bernardo Innocenti <bernie@develer.com>

Applies to uClinux-dist-20030522.

diff -u -3 -p -r1.1.1.1 gen_collate.c
--- uClibc/extra/locale/gen_collate.c	28 Feb 2003 22:45:48 -0000	1.1.1.1
+++ uClibc/extra/locale/gen_collate.c	17 Jun 2003 05:13:50 -0000
@@ -3766,7 +3766,7 @@ static unsigned int add_range_rule(range
 	return  (ruletable_len / MAX_COLLATION_WEIGHTS)-1;
 }
 
-#define DUMPn(X) fprintf(stderr, "%10d-%-.20s", base_locale_array[n]. ## X, #X);
+#define DUMPn(X) fprintf(stderr, "%10d-%-.20s", base_locale_array[n]. X, #X);
 
 static void dump_base_locale(int n)
 {
@@ -3802,7 +3802,7 @@ static void dump_base_locale(int n)
 }
 
 #undef DUMPn
-#define DUMPn(X) fprintf(stderr, "%10d-%s", der_locale_array[n]. ## X, #X);
+#define DUMPn(X) fprintf(stderr, "%10d-%s", der_locale_array[n]. X, #X);
 
 static void dump_der_locale(int n)
 {
@@ -3859,7 +3859,7 @@ static void dump_collate(FILE *fp)
 	OUT_U16C(ruletable_len, "number of ruletable elements");
 
 #undef DUMPn
-#define DUMPn(X) fprintf(fp, "\t%10d, /* %8lu %s */\n", base_locale_array[n]. ## X, collate_pos++, #X);
+#define DUMPn(X) fprintf(fp, "\t%10d, /* %8lu %s */\n", base_locale_array[n]. X, collate_pos++, #X);
 	for (n=0 ; n < base_locale_len ; n++) {
 		unsigned wcs2colidt_offset_low = base_locale_array[n].wcs2colidt_offset & 0xffffU;
 		unsigned wcs2colidt_offset_hi = base_locale_array[n].wcs2colidt_offset >> 16;
@@ -3890,7 +3890,7 @@ static void dump_collate(FILE *fp)
 
 
 	fprintf(fp, "#define COL_IDX_C     %5d\n", 0);
-#define DUMPn(X) fprintf(fp, "\t%10d, /* %8lu %s */\n", der_locale_array[n]. ## X, collate_pos++, #X);
+#define DUMPn(X) fprintf(fp, "\t%10d, /* %8lu %s */\n", der_locale_array[n]. X, collate_pos++, #X);
 	for (n=0 ; n < der_locale_len ; n++) {
 		fprintf(fp, "#define COL_IDX_%s %5d\n", der_locale_array[n].name, n+1);
 		fprintf(fp, "\t/* Derived Locale %4d: %s (%.12s) */\n",
diff -u -3 -p -r1.1.1.1 -r1.2
--- uClibc/libc/sysdeps/linux/common/getdents.c	28 Feb 2003 22:45:54 -0000	1.1.1.1
+++ uClibc/libc/sysdeps/linux/common/getdents.c	3 Mar 2003 18:19:27 -0000	1.2
@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <sysdep.h>
 #include <sys/syscall.h>
+#include <linux/types.h>
 
 
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
@@ -90,7 +91,9 @@ ssize_t __getdents (int fd, char *buf, s
 	dp->d_ino = kdp->d_ino;
 	dp->d_off = kdp->d_off;
 	dp->d_reclen = new_reclen;
+#ifdef __USE_FILE_OFFSET64
 	dp->d_type = DT_UNKNOWN;
+#endif
 	memcpy (dp->d_name, kdp->d_name,
 		kdp->d_reclen - offsetof (struct kernel_dirent, d_name));
 	dp = (struct dirent *) ((char *) dp + new_reclen);
diff -u -3 -p -r1.1.1.4 -r1.3
--- uClibc/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h	19 Mar 2003 19:42:03 -0000	1.1.1.4
+++ uClibc/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h	17 Jun 2003 02:26:58 -0000	1.3
@@ -36,7 +36,7 @@ testandset (int *spinlock)
   char ret;
 
   __asm__ __volatile__(
-#if !defined(__mcf5200__) && !defined(__m68000)
+#if !defined(__mcoldfire__) && !defined(__mcf5200__) && !defined(__m68000)
          "tas %1; sne %0"
 #else
          "bset #7,%1; sne %0"
@@ -57,7 +57,7 @@ register char * stack_pointer __asm__ ("
 
 /* Compare-and-swap for semaphores. */
 
-#if !defined(__mcf5200__) && !defined(__mc68000)
+#if !defined(__mcoldfire__) && !defined(__mcf5200__) && !defined(__mc68000)
 #define HAS_COMPARE_AND_SWAP
 PT_EI int
 __compare_and_swap (long int *p, long int oldval, long int newval)