httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bh...@gensym.com (Ben Hyde)
Subject Re: [PATCH] Resolve BUILD warnings under ULTRIX/mips (take 4)
Date Sat, 11 Apr 1998 15:12:20 GMT

A fourth version of this patch, necessary due to name changes.
  - ben hyde
"echo '[q]sa[ln0=aln256%Pln256/snlbx]sb3135071790101768542287578439snlbxq'|dc"

---
> 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.87
diff -u -r1.87 alloc.c
--- alloc.c	1998/04/11 12:00:28	1.87
+++ alloc.c	1998/04/11 15:07:33
@@ -1536,6 +1536,12 @@
     ap_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 *) ap_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;
 
     ap_block_alarms();
-    f = fdopen(fd, mode);
+    f = hacked_fdopen(fd, mode);
     if (f != NULL)
 	ap_note_cleanups_for_file(a, f);
     ap_unblock_alarms();
Index: modules/proxy/proxy_cache.c
===================================================================
RCS file: /cvs/apache-1.3/src/modules/proxy/proxy_cache.c,v
retrieving revision 1.36
diff -u -r1.36 proxy_cache.c
--- proxy_cache.c	1998/04/11 12:00:39	1.36
+++ proxy_cache.c	1998/04/11 15:07:33
@@ -636,6 +636,9 @@
 int ap_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.73
diff -u -r1.73 mod_autoindex.c
--- mod_autoindex.c	1998/04/11 12:00:44	1.73
+++ mod_autoindex.c	1998/04/11 15:07:33
@@ -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