[or-cvs] r15672: Remove spurious "netintet" check from configure.in (in tor/trunk: . src/common)

[nickm at seul.org]

Author: nickm
Date: 2008-07-05 17:17:04 -0400 (Sat, 05 Jul 2008)
New Revision: 15672

Modified:
   tor/trunk/configure.in
   tor/trunk/src/common/OpenBSD_malloc_Linux.c
Log:
Remove spurious "netintet" check from configure.in

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2008-07-05 15:06:51 UTC (rev 15671)
+++ tor/trunk/configure.in	2008-07-05 21:17:04 UTC (rev 15672)
@@ -315,7 +315,7 @@
 
 dnl These headers are not essential
 
-AC_CHECK_HEADERS(stdint.h sys/types.h inttypes.h sys/param.h sys/wait.h limits.h sys/limits.h netinet/in.h arpa/inet.h machine/limits.h syslog.h sys/time.h sys/resource.h inttypes.h utime.h sys/utime.h sys/mman.h netintet/in.h netinet/in6.h malloc.h sys/syslimits.h malloc/malloc.h)
+AC_CHECK_HEADERS(stdint.h sys/types.h inttypes.h sys/param.h sys/wait.h limits.h sys/limits.h netinet/in.h arpa/inet.h machine/limits.h syslog.h sys/time.h sys/resource.h inttypes.h utime.h sys/utime.h sys/mman.h netinet/in6.h malloc.h sys/syslimits.h malloc/malloc.h)
 
 TOR_CHECK_PROTOTYPE(malloc_good_size, HAVE_MALLOC_GOOD_SIZE_PROTOTYPE,
 [#ifdef HAVE_MALLOC_H

Modified: tor/trunk/src/common/OpenBSD_malloc_Linux.c
===================================================================
--- tor/trunk/src/common/OpenBSD_malloc_Linux.c	2008-07-05 15:06:51 UTC (rev 15671)
+++ tor/trunk/src/common/OpenBSD_malloc_Linux.c	2008-07-05 21:17:04 UTC (rev 15672)
@@ -272,7 +272,7 @@
 char		*malloc_options;
 
 /* Name of the current public function. */
-static char	*malloc_func;
+static const char	*malloc_func;
 
 #define MMAP(size) \
 	mmap((void *)0, (size), PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, \
@@ -439,20 +439,20 @@
 extern char	*__progname;
 
 static void
-wrterror(char *p)
+wrterror(const char *p)
 {
-	char		*q = " error: ";
+	const char		*q = " error: ";
 	struct iovec	iov[5];
 
 	iov[0].iov_base = __progname;
 	iov[0].iov_len = strlen(__progname);
-	iov[1].iov_base = malloc_func;
+	iov[1].iov_base = (char*)malloc_func;
 	iov[1].iov_len = strlen(malloc_func);
-	iov[2].iov_base = q;
+	iov[2].iov_base = (char*)q;
 	iov[2].iov_len = strlen(q);
-	iov[3].iov_base = p;
+	iov[3].iov_base = (char*)p;
 	iov[3].iov_len = strlen(p);
-	iov[4].iov_base = "\n";
+	iov[4].iov_base = (char*)"\n";
 	iov[4].iov_len = 1;
 	writev(STDERR_FILENO, iov, 5);
 
@@ -467,9 +467,9 @@
 }
 
 static void
-wrtwarning(char *p)
+wrtwarning(const char *p)
 {
-	char		*q = " warning: ";
+	const char		*q = " warning: ";
 	struct iovec	iov[5];
 
 	if (malloc_abort)
@@ -479,13 +479,13 @@
 
 	iov[0].iov_base = __progname;
 	iov[0].iov_len = strlen(__progname);
-	iov[1].iov_base = malloc_func;
+	iov[1].iov_base = (char*)malloc_func;
 	iov[1].iov_len = strlen(malloc_func);
-	iov[2].iov_base = q;
+	iov[2].iov_base = (char*)q;
 	iov[2].iov_len = strlen(q);
-	iov[3].iov_base = p;
+	iov[3].iov_base = (char*)p;
 	iov[3].iov_len = strlen(p);
-	iov[4].iov_base = "\n";
+	iov[4].iov_base = (char*)"\n";
 	iov[4].iov_len = 1;
 	
 	writev(STDERR_FILENO, iov, 5);
@@ -1707,6 +1707,7 @@
 #endif	/* MALLOC_EXTRA_SANITY */
 	void		*vp;
 	long		i;
+	(void) index;
 
 	/* Find the chunk number on the page */
 	i = ((u_long) ptr & malloc_pagemask) >> info->shift;