* 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.

diff --git a/ChangeLog b/ChangeLog
index f8d7d5f9b11accb9e867ff940c2058f30e2b32c4..bc5968e82679c1cda8ded53283e8fb436d9eafc1 100644 (file)
--- 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 2b46c604a7c841b50d07fbaa804a44a94d0326d5..0b0c18b59879e9b863d882454342b426e0526dd1 100644 (file)
--- 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 312203d0dadf80a89e186719435be1db2b657db5..415a1fa1e466c13aa76d0860c2edf68023a4a2ee 100644 (file)
--- 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) */