This takes the BeOS defines to include the networking code. Removed some uneeded

defines and change some to be more obvious.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60196 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 20 insertions, 32 deletions

diff --git a/include/arch/beos/networkio.h b/include/arch/beos/networkio.h
index b37797cb7..3c2bcc535 100644
--- a/include/arch/beos/networkio.h
+++ b/include/arch/beos/networkio.h
@@ -52,8 +52,9 @@
  * <http://www.apache.org/>.
  */
 
-#ifdef HAVE_NETINET_TCP_H
-#include "../unix/network_io.h"
+#include "apr_private.h"
+#if BEOS_BONE /* woohoo - we can use the Unix code! */
+#include "../unix/networkio.h"
 #else
 
 #ifndef NETWORK_IO_H
@@ -75,13 +76,13 @@
 
 /* The definition of isascii was missed from the PowerPC ctype.h
  *
- * It will be included in the next release, but until then... */
-#if __POWERPC__
+ * It will be included in the next release, but until then... 
+ */
+#if !HAVE_isascii
 #define isascii(c) (((c) & ~0x7f)==0)
 #endif
 
 #include "apr_general.h"
-#include <ByteOrder.h> /* for the ntohs definition */
 
 #define POLLIN	 1
 #define POLLPRI  2
@@ -112,6 +113,7 @@ struct ap_pollfd_t {
 ap_int16_t get_event(ap_int16_t);
 
 int inet_aton(const char *cp, struct in_addr *addr);
+#include <ByteOrder.h> /* for the ntohs definition */
 
 #endif  /* ! NETWORK_IO_H */
 #endif
diff --git a/include/arch/unix/networkio.h b/include/arch/unix/networkio.h
index e2ebc842b..ad5173687 100644
--- a/include/arch/unix/networkio.h
+++ b/include/arch/unix/networkio.h
@@ -106,14 +106,6 @@
 #endif
 /* End System Headers */
 
-/* The definition of isascii was missed from the BeOS PowerPC ctype.h
- *
- * It will be included in the next release, but until then... 
- */
-#if (HAVE_ISASCII == 0)
-#define isascii(c) (((c) & ~0x7f)==0)
-#endif
-
 #ifndef HAVE_POLLIN
 #define POLLIN   1
 #define POLLPRI  2
diff --git a/network_io/beos/inet_aton.c b/network_io/beos/inet_aton.c
index 1489487d8..7b4103e06 100644
--- a/network_io/beos/inet_aton.c
+++ b/network_io/beos/inet_aton.c
@@ -69,7 +69,7 @@
  */
 
 #include "apr_private.h"
-#ifndef HAVE_NETINET_TCP_H
+#if BEOS_R5 /* this isn't needed for BONE */
 
 #include "networkio.h"
 
diff --git a/network_io/beos/networkio.h b/network_io/beos/networkio.h
index b37797cb7..3c2bcc535 100644
--- a/network_io/beos/networkio.h
+++ b/network_io/beos/networkio.h
@@ -52,8 +52,9 @@
  * <http://www.apache.org/>.
  */
 
-#ifdef HAVE_NETINET_TCP_H
-#include "../unix/network_io.h"
+#include "apr_private.h"
+#if BEOS_BONE /* woohoo - we can use the Unix code! */
+#include "../unix/networkio.h"
 #else
 
 #ifndef NETWORK_IO_H
@@ -75,13 +76,13 @@
 
 /* The definition of isascii was missed from the PowerPC ctype.h
  *
- * It will be included in the next release, but until then... */
-#if __POWERPC__
+ * It will be included in the next release, but until then... 
+ */
+#if !HAVE_isascii
 #define isascii(c) (((c) & ~0x7f)==0)
 #endif
 
 #include "apr_general.h"
-#include <ByteOrder.h> /* for the ntohs definition */
 
 #define POLLIN	 1
 #define POLLPRI  2
@@ -112,6 +113,7 @@ struct ap_pollfd_t {
 ap_int16_t get_event(ap_int16_t);
 
 int inet_aton(const char *cp, struct in_addr *addr);
+#include <ByteOrder.h> /* for the ntohs definition */
 
 #endif  /* ! NETWORK_IO_H */
 #endif
diff --git a/network_io/beos/poll.c b/network_io/beos/poll.c
index 86b0a0094..258b000a5 100644
--- a/network_io/beos/poll.c
+++ b/network_io/beos/poll.c
@@ -53,7 +53,7 @@
  */
 
 #include "apr_private.h"
-#ifdef HAVE_NETINET_TCP_H
+#if BEOS_BONE /* BONE uses the unix code - woohoo */
 #include "../unix/poll.c"
 #else
 #include "networkio.h"
diff --git a/network_io/beos/sendrecv.c b/network_io/beos/sendrecv.c
index 8d52f8d98..389bcdbd2 100644
--- a/network_io/beos/sendrecv.c
+++ b/network_io/beos/sendrecv.c
@@ -53,7 +53,7 @@
  */
 
 #include "apr_private.h"
-#ifdef HAVE_NETINET_TCP_H
+#if BEOS_BONE /* BONE uses the unix code - woohoo */
 #include "../unix/sendrecv.c"
 #else
 #include "networkio.h"
diff --git a/network_io/beos/sockaddr.c b/network_io/beos/sockaddr.c
index 76fd25d2e..17bcb4b19 100644
--- a/network_io/beos/sockaddr.c
+++ b/network_io/beos/sockaddr.c
@@ -53,7 +53,7 @@
  */
 
 #include "apr_private.h"
-#ifdef HAVE_NETINET_TCP_H
+#if BEOS_BONE /* BONE uses the unix code - woohoo */
 #include "../unix/sockaddr.c"
 #else
 #include "networkio.h"
diff --git a/network_io/beos/sockets.c b/network_io/beos/sockets.c
index f6f109e20..9a251bf91 100644
--- a/network_io/beos/sockets.c
+++ b/network_io/beos/sockets.c
@@ -53,7 +53,7 @@
  */
 
 #include "apr_private.h"
-#ifdef HAVE_NETINET_TCP_H
+#if BEOS_BONE /* BONE uses the unix code - woohoo */
 #include "../unix/sockets.c"
 #else
 #include "networkio.h"
diff --git a/network_io/beos/sockopt.c b/network_io/beos/sockopt.c
index 9710ff2de..c487dfc29 100644
--- a/network_io/beos/sockopt.c
+++ b/network_io/beos/sockopt.c
@@ -53,7 +53,7 @@
  */
 
 #include "apr_private.h"
-#ifdef HAVE_NETINET_TCP_H
+#if BEOS_BONE /* BONE uses the unix code - woohoo */
 #include "../unix/sockopt.c"
 #else
 #include "networkio.h"
diff --git a/network_io/unix/networkio.h b/network_io/unix/networkio.h
index e2ebc842b..ad5173687 100644
--- a/network_io/unix/networkio.h
+++ b/network_io/unix/networkio.h
@@ -106,14 +106,6 @@
 #endif
 /* End System Headers */
 
-/* The definition of isascii was missed from the BeOS PowerPC ctype.h
- *
- * It will be included in the next release, but until then... 
- */
-#if (HAVE_ISASCII == 0)
-#define isascii(c) (((c) & ~0x7f)==0)
-#endif
-
 #ifndef HAVE_POLLIN
 #define POLLIN   1
 #define POLLPRI  2