diff options
author | jkh <jkh@FreeBSD.org> | 1995-04-26 14:04:36 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1995-04-26 14:04:36 +0000 |
commit | 41bc6e0fbe329ac8511fbd487a7377045aa8b512 (patch) | |
tree | f1fee4ff52b22dcc5277d0fd1eda476271c7544d /lib | |
parent | dec02faeac982ccf99444d469d66efdbe7f335d5 (diff) | |
download | FreeBSD-src-41bc6e0fbe329ac8511fbd487a7377045aa8b512.zip FreeBSD-src-41bc6e0fbe329ac8511fbd487a7377045aa8b512.tar.gz |
Fix a number of additional warnings.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libftp/utils/cdefs.h | 13 | ||||
-rw-r--r-- | lib/libftp/utils/uftp.c | 2 |
2 files changed, 2 insertions, 13 deletions
diff --git a/lib/libftp/utils/cdefs.h b/lib/libftp/utils/cdefs.h index fc329d6..aede2ec 100644 --- a/lib/libftp/utils/cdefs.h +++ b/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 diff --git a/lib/libftp/utils/uftp.c b/lib/libftp/utils/uftp.c index 49037ad0..fe64ffd 100644 --- a/lib/libftp/utils/uftp.c +++ b/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())) { |