httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bh...@gensym.com (Ben Hyde)
Subject [PATCH] Resolve BUILD warnings under ULTRIX/mips (take 3)
Date Fri, 10 Apr 1998 20:31:32 GMT

This third version of this patch avoids touching alloc.h.
It takes handful fewer lines, and uses a cast (Dean felt
that inside a BRAIN_DEAD a cast was tolerable :) ).  - ben hyde

---
> cvs diff -u main/alloc.c modules/proxy/proxy_cache.c modules/standard/mod_autoindex.c
Index: main/alloc.c
===================================================================
RCS file: /cvs/apache-1.3/src/main/alloc.c,v
retrieving revision 1.86
diff -u -r1.86 alloc.c
--- alloc.c	1998/04/06 07:26:27	1.86
+++ alloc.c	1998/04/10 19:55:19
@@ -1536,6 +1536,12 @@
     register_cleanup(p, (void *) fp, file_cleanup, file_child_cleanup);
 }
 
+#ifdef ULTRIX_BRAIN_DEATH
+#define hacked_fdopen(d,m) fdopen((d), (char *)(m))
+#else
+#define hacked_fdopen(d,m) fdopen((d), (m))
+#endif
+
 API_EXPORT(FILE *) pfopen(pool *a, const char *name, const char *mode)
 {
     FILE *fd = NULL;
@@ -1557,7 +1563,7 @@
 		    modeFlags);
 	if (desc >= 0) {
 	    desc = ap_slack(desc, AP_SLACK_LOW);
-	    fd = fdopen(desc, mode);
+	    fd = hacked_fdopen(desc, mode);
 	}
     }
     else {
@@ -1575,7 +1581,7 @@
     FILE *f;
 
     block_alarms();
-    f = fdopen(fd, mode);
+    f = hacked_fdopen(fd, mode);
     if (f != NULL)
 	note_cleanups_for_file(a, f);
     unblock_alarms();
Index: modules/proxy/proxy_cache.c
===================================================================
RCS file: /cvs/apache-1.3/src/modules/proxy/proxy_cache.c,v
retrieving revision 1.35
diff -u -r1.35 proxy_cache.c
--- proxy_cache.c	1998/03/31 12:53:01	1.35
+++ proxy_cache.c	1998/04/10 19:55:20
@@ -636,6 +636,9 @@
 int proxy_cache_update(struct cache_req *c, array_header *resp_hdrs,
 		       const int is_HTTP1, int nocache)
 {
+#ifdef ULTRIX_BRAIN_DEATH
+  extern char *mktemp(char *template);
+#endif 
     request_rec *r = c->req;
     char *p;
     int i;
Index: modules/standard/mod_autoindex.c
===================================================================
RCS file: /cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.72
diff -u -r1.72 mod_autoindex.c
--- mod_autoindex.c	1998/03/31 12:53:09	1.72
+++ mod_autoindex.c	1998/04/10 19:55:20
@@ -1113,12 +1113,8 @@
 	    p = p->next;
 	}
 
-#ifdef ULTRIX_BRAIN_DEATH
-	qsort((void *) ar, num_ent, sizeof(struct ent *), (int (*)) dsortf);
-#else
 	qsort((void *) ar, num_ent, sizeof(struct ent *),
 	          (int (*)(const void *, const void *)) dsortf);
-#endif
     }
     output_directories(ar, num_ent, autoindex_conf, r, autoindex_opts, keyid,
 		       direction);

Mime
View raw message