SCO patch attempt.

[mouring at etoh.eviladmin.org]

On Thu, 11 Jan 2001, Tim Rice wrote:

> 
> 
> On Thu, 11 Jan 2001, Tim Rice wrote:
> 
> > On Thu, 11 Jan 2001 mouring at etoh.eviladmin.org wrote:
> > 
> > > 
> > > diff -ur openssh/bsd-misc.h ossh/bsd-misc.h
> > > --- openssh/bsd-misc.h	Thu Nov 16 21:47:20 2000
> > > +++ ossh/bsd-misc.h	Thu Jan 11 21:34:12 2001
> > > @@ -54,4 +54,15 @@
> > >  const char *strerror(int e);
> > >  #endif 
> > >  
> > > +
> > > +#ifndef HAVE_UTIMES
> > > +struct timeval {
> > > +	long tv_sec;
> > > +	long tv_usec;
> > 
> > OK, change #ifndef HAVE_UTIMES to
> > #if !defined(HAVE_UTIMES)  &&  !defined(HAVE_UTIME)
>  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> It was allready past bedtime when I fired this off and now I can't sleep
> because this doesn't make any sense.
> 
> I was getting 
> ...
> cc -g -I/usr/local/include -I/usr/local/ssl/include -I. -Isrc -DETCDIR=\"/usr/lo
> cal/etc\" -DSSH_PROGRAM=\"/usr/local/bin/ssh\" -DSSH_ASKPASS_DEFAULT=\"/usr/loca
> l/libexec/ssh-askpass\" -DHAVE_CONFIG_H -c src/bsd-arc4random.c
> UX:acomp: ERROR: "src/bsd-misc.h", line 59: (struct) tag redeclared: timeval
> UX:acomp: ERROR: "src/bsd-misc.h", line 64: invalid type combination
> gmake: *** [bsd-arc4random.o] Error 1
> ...

Ermm.. What other commands use 'timeval'?  If you have a valid
timeval.  Then one is going to have to test the existance of timeval like
they do other structures and set or not-set accordingly.

- Ben