diff options
| author | ache <ache@FreeBSD.org> | 1995-11-23 20:19:56 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1995-11-23 20:19:56 +0000 |
| commit | 1f51b31ec3978813dd910fca3dcde0399c4b1956 (patch) | |
| tree | 64bce36155593f1ef1904b609f7c8f230b961e09 /usr.bin/ncftp/sys.h | |
| parent | d6bc2c568f53a6b0302dd7290dbdd8a9cdcf967b (diff) | |
| download | FreeBSD-src-1f51b31ec3978813dd910fca3dcde0399c4b1956.zip FreeBSD-src-1f51b31ec3978813dd910fca3dcde0399c4b1956.tar.gz | |
Merge with current. Back out all trailing spaces changes, they
hits again and again.
Diffstat (limited to 'usr.bin/ncftp/sys.h')
| -rw-r--r-- | usr.bin/ncftp/sys.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/ncftp/sys.h b/usr.bin/ncftp/sys.h index e357c4d..9b37427 100644 --- a/usr.bin/ncftp/sys.h +++ b/usr.bin/ncftp/sys.h @@ -257,7 +257,7 @@ extern int errno; # define Select(a,b,c,d,e) select((a), (int *)(b), (c), (d), (e)) #endif -#ifdef HPUX +#ifdef HPUX # define System "HP-UX" # ifndef _HPUX_SOURCE # define _HPUX_SOURCE 1 @@ -424,6 +424,7 @@ extern int errno; # define TERMIOS 1 # define HAS_GETCWD 1 # define U_WAIT 1 +# define NO_CONST 1 /* avoid prototype conflict */ #endif #ifdef __NetBSD__ @@ -446,9 +447,9 @@ extern int errno; # define SYSDIRH 1 # endif # endif -# ifndef SGTTYB -# define SGTTYB -# endif +# ifndef SGTTYB +# define SGTTYB 1 +# endif #endif /* @@ -595,7 +596,7 @@ extern void bcopy(char *, char *, size_t); extern void bzero(char *, size_t); #endif -#ifdef SOCKS +#ifdef SOCKS extern int Raccept(int, struct sockaddr *, int *); extern int Rbind(int, struct sockaddr *, int, unsigned long); extern int Rconnect(int, struct sockaddr *, int); |
