Deduplicate the INADDR_NONE definition for Solaris by moving it to jbsockets.h

While at it, add a comment about whether or not the workaround is still needed.

diff --git a/filters.h b/filters.h
index 6e08dda..b0374ce 100644 (file)
--- a/filters.h
+++ b/filters.h
@@ -1,6 +1,6 @@
 #ifndef FILTERS_H_INCLUDED
 #define FILTERS_H_INCLUDED
 #ifndef FILTERS_H_INCLUDED
 #define FILTERS_H_INCLUDED

-#define FILTERS_H_VERSION "$Id: filters.h,v 1.40 2010/09/14 07:14:56 fabiankeil Exp $"
+#define FILTERS_H_VERSION "$Id: filters.h,v 1.41 2010/09/14 07:16:07 fabiankeil Exp $"

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.h,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.h,v $


@@ -117,14 +117,6 @@ extern int filters_available(const struct client_state *csp);
  */
 extern struct http_response *direct_response(struct client_state *csp);
 
  */
 extern struct http_response *direct_response(struct client_state *csp);
 

-
-/*
- * Solaris fix:
- */
-#ifndef INADDR_NONE
-#define INADDR_NONE -1
-#endif     
-

 /* 
  * Revision control strings from this header and associated .c file
  */
 /* 
  * Revision control strings from this header and associated .c file
  */

diff --git a/gateway.h b/gateway.h
index beb3b0b..e9ddbc4 100644 (file)
--- a/gateway.h
+++ b/gateway.h
@@ -1,6 +1,6 @@
 #ifndef GATEWAY_H_INCLUDED
 #define GATEWAY_H_INCLUDED
 #ifndef GATEWAY_H_INCLUDED
 #define GATEWAY_H_INCLUDED

-#define GATEWAY_H_VERSION "$Id: gateway.h,v 1.18 2009/09/06 14:15:46 fabiankeil Exp $"
+#define GATEWAY_H_VERSION "$Id: gateway.h,v 1.19 2009/10/03 10:37:49 fabiankeil Exp $"

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/gateway.h,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/gateway.h,v $


@@ -70,13 +70,6 @@ extern int connection_destination_matches(const struct reusable_connection *conn
                                           const struct forward_spec *fwd);
 #endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
 
                                           const struct forward_spec *fwd);
 #endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
 

-/*
- * Solaris fix
- */
-#ifndef INADDR_NONE
-#define INADDR_NONE -1
-#endif
-

 /*
  * Revision control strings from this header and associated .c file
  */
 /*
  * Revision control strings from this header and associated .c file
  */

diff --git a/jbsockets.h b/jbsockets.h
index 6b74b1d..cdee3c2 100644 (file)
--- a/jbsockets.h
+++ b/jbsockets.h
@@ -1,6 +1,6 @@
 #ifndef JBSOCKETS_H_INCLUDED
 #define JBSOCKETS_H_INCLUDED
 #ifndef JBSOCKETS_H_INCLUDED
 #define JBSOCKETS_H_INCLUDED

-#define JBSOCKETS_H_VERSION "$Id: jbsockets.h,v 1.17 2010/04/23 11:53:48 fabiankeil Exp $"
+#define JBSOCKETS_H_VERSION "$Id: jbsockets.h,v 1.18 2011/07/17 13:34:36 fabiankeil Exp $"

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jbsockets.h,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jbsockets.h,v $


@@ -68,6 +68,15 @@ extern int socket_is_still_alive(jb_socket sfd);
 extern const char jbsockets_rcs[];
 extern const char jbsockets_h_rcs[];
 
 extern const char jbsockets_rcs[];
 extern const char jbsockets_h_rcs[];
 

+/*
+ * Solaris workaround
+ * XXX: still necessary?
+ */
+#ifndef INADDR_NONE
+#define INADDR_NONE -1
+#endif
+
+

 #ifdef __cplusplus
 } /* extern "C" */
 #endif
 #ifdef __cplusplus
 } /* extern "C" */
 #endif