From 5bfee194c0fe07a35cc3b4c2d7491f809c62b293 Mon Sep 17 00:00:00 2001
From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Thu, 23 Jun 2005 20:48:41 +0000
Subject: [PATCH] * conf/nfs_prot/nfs_prot_sunos5_8.h: don't define INADDR_NONE
 here, but in the actual source files that may need it.

* libamu/wire.c (INADDR_NONE): define INADDR_NONE if not defined
already.
---
 ChangeLog                         | 6 ++++++
 conf/nfs_prot/nfs_prot_sunos5_8.h | 6 +-----
 libamu/wire.c                     | 6 +++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f8d7d5f9..bc5968e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-06-23  Erez Zadok  <ezk@cs.sunysb.edu>
 
+	* conf/nfs_prot/nfs_prot_sunos5_8.h: don't define INADDR_NONE
+	here, but in the actual source files that may need it.
+
+	* libamu/wire.c (INADDR_NONE): define INADDR_NONE if not defined
+	already.
+
 	* include/am_defs.h: define extern for sleep(3) if needed.
 
 	* m4/macros/header_templates.m4: template for sleep(3) extern.
diff --git a/conf/nfs_prot/nfs_prot_sunos5_8.h b/conf/nfs_prot/nfs_prot_sunos5_8.h
index 2b46c604..0b0c18b5 100644
--- a/conf/nfs_prot/nfs_prot_sunos5_8.h
+++ b/conf/nfs_prot/nfs_prot_sunos5_8.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: nfs_prot_sunos5_8.h,v 1.11 2005/06/03 14:46:36 ezk Exp $
+ * $Id: nfs_prot_sunos5_8.h,v 1.12 2005/06/23 20:48:41 ezk Exp $
  *
  */
 
@@ -104,10 +104,6 @@
 
 #define AUTOFS_CONFTYPE "ticotsord"
 
-#ifndef INADDR_NONE
-# define INADDR_NONE ((unsigned long) -1)
-#endif /* INADDR_NONE */
-
 /*
  * TYPEDEFS:
  */
diff --git a/libamu/wire.c b/libamu/wire.c
index 312203d0..415a1fa1 100644
--- a/libamu/wire.c
+++ b/libamu/wire.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: wire.c,v 1.23 2005/05/27 21:26:34 ezk Exp $
+ * $Id: wire.c,v 1.24 2005/06/23 20:48:42 ezk Exp $
  *
  */
 
@@ -81,6 +81,10 @@ struct addrlist {
 };
 static addrlist *localnets = NULL;
 
+#ifndef INADDR_NONE
+# define INADDR_NONE ((unsigned long) -1)
+#endif /* INADDR_NONE */
+
 #if defined(IFF_LOCAL_LOOPBACK) && !defined(IFF_LOOPBACK)
 # define IFF_LOOPBACK	IFF_LOCAL_LOOPBACK
 #endif /* defined(IFF_LOCAL_LOOPBACK) && !defined(IFF_LOOPBACK) */
-- 
2.43.0