Fix a number of additional warnings.

lib/libftp/utils/cdefs.h

@@ -47,18 +47,7 @@
 #define	__END_DECLS
 #endif
 
-/*
- * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
- * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.
- * The __CONCAT macro is a bit tricky -- make sure you don't put spaces
- * in between its arguments.  __CONCAT can also concatenate double-quoted
- * strings produced by the __STRING macro, but this only works with ANSI C.
- */
-#if (defined(__STDC__) || defined(__cplusplus)) && !defined(__CONCAT)
-#define	__P(protos)	protos		/* full-blown ANSI C */
-#define	__CONCAT(x,y)	x ## y
-#define	__STRING(x)	#x
-
+#if (defined(__STDC__) || defined(__cplusplus))
 #define	__const		const		/* define reserved names to standard */
 #define	__signed	signed
 #define	__volatile	volatile

lib/libftp/utils/uftp.c

@@ -241,7 +241,7 @@ execute (char *cmd)
   if ( *cmd == '!' ) 
     {
       int pid,_pid;
-      union wait status;
+      int status;
       
       if (!(pid=fork()))
 	{