From: Philip Hazel <ph10@hermes.cam.ac.uk>
Date: Wed, 6 Apr 2005 14:09:17 +0000 (+0000)
Subject: Modify OS/os.c-Linux so that Exim compiles on kfreebsd-gnu (sic).
X-Git-Tag: exim-4_51~23
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7e8bec7a4f372261874a73641c6bc0dadeafab7d;p=exim.git

Modify OS/os.c-Linux so that Exim compiles on kfreebsd-gnu (sic).
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 8f648575b..2d4044efc 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.114 2005/04/06 14:03:53 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.115 2005/04/06 14:09:17 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -168,6 +168,15 @@ PH/27 $acl_verify_message is now set immediately after the failure of a
       Previously, $acl_verify_message was set only while expanding "message"
       and "log_message" when a very denied access.
 
+PH/28 Modified OS/os.c-Linux with
+
+        -#ifndef OS_LOAD_AVERAGE
+        +#if !defined(OS_LOAD_AVERAGE) && defined(__linux__)
+
+      to make Exim compile on kfreebsd-gnu. (I'm totally confused about the
+      nomenclature these days.)
+
+
 
 A note about Exim versions 4.44 and 4.50
 ----------------------------------------
diff --git a/src/OS/os.c-Linux b/src/OS/os.c-Linux
index 5589a015b..88b78993d 100644
--- a/src/OS/os.c-Linux
+++ b/src/OS/os.c-Linux
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/OS/os.c-Linux,v 1.1 2004/10/06 15:07:39 ph10 Exp $ */
+/* $Cambridge: exim/src/OS/os.c-Linux,v 1.2 2005/04/06 14:09:17 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -20,7 +20,7 @@ a unique function here, and define OS_LOAD_AVERAGE to stop src/os.c trying to
 provide the function. However, when compiling os.c for utilities, we may not
 want this at all, so check that it isn't set first. */
 
-#ifndef OS_LOAD_AVERAGE
+#if !defined(OS_LOAD_AVERAGE) && defined(__linux__)
 #define OS_LOAD_AVERAGE
 
 /* Linux has 2 ways of returning load average:
@@ -114,9 +114,9 @@ last = yield;
 if (last != NULL) while (last->next != NULL) last = last->next;
 
 while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %20s\n",
-	     addr6p[0], addr6p[1], addr6p[2], addr6p[3],
-	     addr6p[4], addr6p[5], addr6p[6], addr6p[7],
-	     &if_idx, &plen, &scope, &dad_status, devname) != EOF)
+             addr6p[0], addr6p[1], addr6p[2], addr6p[3],
+             addr6p[4], addr6p[5], addr6p[6], addr6p[7],
+             &if_idx, &plen, &scope, &dad_status, devname) != EOF)
   {
   struct sockaddr_in6 addr;
 
@@ -126,8 +126,8 @@ while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %20s\n",
   next->next = NULL;
   next->port = 0;
   sprintf(CS next->address, "%s:%s:%s:%s:%s:%s:%s:%s",
-	 addr6p[0], addr6p[1], addr6p[2], addr6p[3],
-	 addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
+         addr6p[0], addr6p[1], addr6p[2], addr6p[3],
+         addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
 
   /* Normalize the representation */