From 93ccd15072d5fe7cfcc033f552c3677ea0bb8139 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Thu, 7 Mar 2002 00:21:38 +0000 Subject: [PATCH] define "unix" on BSD git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14232 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/gssftp/ftp/ChangeLog | 4 ++++ src/appl/gssftp/ftp/cmds.c | 7 ++----- src/appl/gssftp/ftpd/ChangeLog | 4 ++++ src/appl/gssftp/ftpd/ftpcmd.y | 6 ++---- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog index fc15245da..21a1d2832 100644 --- a/src/appl/gssftp/ftp/ChangeLog +++ b/src/appl/gssftp/ftp/ChangeLog @@ -1,3 +1,7 @@ +2002-03-05 Ken Raeburn + + * cmds.c (unix): Define if BSD is defined. + 2001-11-30 Tom Yu * glob.c (execbrc): Fix some fencepost errors. Don't copy diff --git a/src/appl/gssftp/ftp/cmds.c b/src/appl/gssftp/ftp/cmds.c index 807da5843..38d721473 100644 --- a/src/appl/gssftp/ftp/cmds.c +++ b/src/appl/gssftp/ftp/cmds.c @@ -199,11 +199,8 @@ void setpeer(argc, argv) } #ifndef unix -#ifdef _AIX -#define unix -#endif - -#ifdef __hpux +/* sigh */ +#if defined(_AIX) || defined(__hpux) || defined(BSD) #define unix #endif #endif diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog index 8bb355b86..85c729df2 100644 --- a/src/appl/gssftp/ftpd/ChangeLog +++ b/src/appl/gssftp/ftpd/ChangeLog @@ -1,3 +1,7 @@ +2002-03-05 Ken Raeburn + + * ftpcmd.y (unix): Define if BSD is defined. + 2002-01-08 Ken Raeburn * ftpd.c (login): New argument LOGINCODE, optional result code to diff --git a/src/appl/gssftp/ftpd/ftpcmd.y b/src/appl/gssftp/ftpd/ftpcmd.y index f7f16122a..156ecd33c 100644 --- a/src/appl/gssftp/ftpd/ftpcmd.y +++ b/src/appl/gssftp/ftpd/ftpcmd.y @@ -89,10 +89,8 @@ extern gss_ctx_id_t gcontext; #endif #ifndef unix -#ifdef _AIX -#define unix -#endif -#ifdef __hpux +/* sigh */ +#if defined(_AIX) || defined(__hpux) || defined(BSD) #define unix #endif #endif -- 2.26.2