ph10 2005/04/06 15:09:17 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/OS os.c-Linux
Log:
Modify OS/os.c-Linux so that Exim compiles on kfreebsd-gnu (sic).
Revision Changes Path
1.115 +9 -0 exim/exim-doc/doc-txt/ChangeLog
1.2 +6 -6 exim/exim-src/OS/os.c-Linux
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- ChangeLog 6 Apr 2005 14:03:53 -0000 1.114
+++ ChangeLog 6 Apr 2005 14:09:17 -0000 1.115
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.114 2005/04/06 14:03:53 ph10 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -167,6 +167,15 @@
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
Index: os.c-Linux
===================================================================
RCS file: /home/cvs/exim/exim-src/OS/os.c-Linux,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- os.c-Linux 6 Oct 2004 15:07:39 -0000 1.1
+++ os.c-Linux 6 Apr 2005 14:09:17 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/OS/os.c-Linux,v 1.1 2004/10/06 15:07:39 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
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 @@
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 @@
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 */
