svn commit: samba r8451 - in branches/SAMBA_4_0/source: heimdal_build lib/appweb/mpr

[tridge at samba.org]

Author: tridge
Date: 2005-07-14 07:04:21 +0000 (Thu, 14 Jul 2005)
New Revision: 8451

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8451

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

its been a long haul ...

Modified:
   branches/SAMBA_4_0/source/heimdal_build/replace.c
   branches/SAMBA_4_0/source/lib/appweb/mpr/var.c


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/replace.c
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/replace.c	2005-07-14 06:36:19 UTC (rev 8450)
+++ branches/SAMBA_4_0/source/heimdal_build/replace.c	2005-07-14 07:04:21 UTC (rev 8451)
@@ -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;

Modified: branches/SAMBA_4_0/source/lib/appweb/mpr/var.c
===================================================================
--- branches/SAMBA_4_0/source/lib/appweb/mpr/var.c	2005-07-14 06:36:19 UTC (rev 8450)
+++ branches/SAMBA_4_0/source/lib/appweb/mpr/var.c	2005-07-14 07:04:21 UTC (rev 8451)
@@ -2165,8 +2165,10 @@
 #elif VXWORKS
 	/* FUTURE */
 	return (0);
+#elif defined(FP_NAN)
+	return (f == FP_NAN);
 #else
-	return (f == FP_NAN);
+	return 0;
 #endif
 }
 /******************************************************************************/
@@ -2178,8 +2180,10 @@
 #elif VXWORKS
 	/* FUTURE */
 	return (0);
+#elif defined(FP_INFINITE)
+	return (f == FP_INFINITE);
 #else
-	return (f == FP_INFINITE);
+	return 0;
 #endif
 }