1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00

r8451: samba4 finally builds on solaris 8 sparc with heimdal and ejs

its been a long haul ...
(This used to be commit 3c4291e49abed14973b4a4fa1a9277918b896cac)
This commit is contained in:
Andrew Tridgell 2005-07-14 07:04:21 +00:00 committed by Gerald (Jerry) Carter
parent af0574378b
commit fa2b97a20a
2 changed files with 20 additions and 7 deletions

View File

@ -23,6 +23,8 @@
#include "config.h"
#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
#include "err.h"
#include "roken.h"
@ -62,15 +64,22 @@
#ifndef HAVE_FLOCK
int flock(int fd, int op)
{
struct flock lock;
lock.l_whence = 0;
lock.l_start = 0;
lock.l_len = 0;
lock.l_pid = 0;
switch (op & (LOCK_UN|LOCK_SH|LOCK_EX)) {
case LOCK_UN:
return fcntl_lock(fd, F_SETLK, 0, 0, F_UNLCK);
lock.l_type = F_UNLCK;
return fcntl(fd, F_SETLK, &lock);
case LOCK_SH:
return fcntl_lock(fd, (op&LOCK_NB)?F_SETLK:F_SETLKW,
0, 0, F_RDLCK);
lock.l_type = F_RDLCK;
return fcntl(fd, (op&LOCK_NB)?F_SETLK:F_SETLKW, &lock);
case LOCK_EX:
return fcntl_lock(fd, (op&LOCK_NB)?F_SETLK:F_SETLKW,
0, 0, F_WRLCK);
lock.l_type = F_WRLCK;
return fcntl(fd, (op&LOCK_NB)?F_SETLK:F_SETLKW, &lock);
}
errno = EINVAL;
return -1;

View File

@ -2165,8 +2165,10 @@ bool mprIsNan(double f)
#elif VXWORKS
/* FUTURE */
return (0);
#else
#elif defined(FP_NAN)
return (f == FP_NAN);
#else
return 0;
#endif
}
/******************************************************************************/
@ -2178,8 +2180,10 @@ bool mprIsInfinite(double f)
#elif VXWORKS
/* FUTURE */
return (0);
#else
#elif defined(FP_INFINITE)
return (f == FP_INFINITE);
#else
return 0;
#endif
}