TPF-specific patch to skip fcntl() on sockets.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@98099 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/main/alloc.c b/src/main/alloc.c
index ed7f035d987aa144a9d7f47dc747c45661336db7..61a432c33ebc6324f712f3a45d6dee8df61658df 100644 (file)
--- a/src/main/alloc.c
+++ b/src/main/alloc.c
@@ -2103,6 +2103,9 @@ static int socket_magic_cleanup(void *fpv)
 
 API_EXPORT(void) ap_note_cleanups_for_socket_ex(pool *p, int fd, int domagic)
 {
+#ifdef TPF
+    domagic = 0; /* skip magic (fcntl) for TPF sockets, at least for now */
+#endif
     ap_register_cleanup_ex(p, (void *) (long) fd, socket_cleanup,
                            socket_cleanup,
                            domagic ? socket_magic_cleanup : NULL);

diff --git a/src/main/util_uri.c b/src/main/util_uri.c
index 802790aa8294233e45989c7ee2a85ca6cb090a97..38930e236f2d61b8c6afd20d9416296f8445934b 100644 (file)
--- a/src/main/util_uri.c
+++ b/src/main/util_uri.c
@@ -163,7 +163,12 @@ API_EXPORT(struct hostent *) ap_pduphostent(pool *p, const struct hostent *hp)
  */
 API_EXPORT(struct hostent *) ap_pgethostbyname(pool *p, const char *hostname)
 {
+#ifdef TPF
+    /* get rid of compilation warning on TPF */
+    struct hostent *hp = gethostbyname((char *)hostname);
+#else
     struct hostent *hp = gethostbyname(hostname);
+#endif
     return (hp == NULL) ? NULL : ap_pduphostent(p, hp);
 }