From: Arjan de Vet <Arjan.deVet@nl.cis.philips.com>

The following patch fixes a bug with tmp_error_buf and makes
compilation work when USE_ASYNC_IO is defined.

diff --git a/src/globals.h b/src/globals.h
index 0983df277b49e021e569589010a3969c94f434f2..205ff8e3eb6a3f07564f57eca492fd8a11a74e1b 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -11,7 +11,7 @@ extern char *IcpOpcodeStr[];
 extern char *dns_error_message;        /* NULL */
 extern const char *log_tags[];
 extern const char *err_string[];
-extern char *tmp_error_buf;    /* NULL */
+extern char tmp_error_buf[ERROR_BUF_SZ];
 extern char *volatile debug_options;   /* NULL */
 extern char ThisCache[SQUIDHOSTNAMELEN << 1];
 extern char config_input_line[BUFSIZ];

diff --git a/src/protos.h b/src/protos.h
index 9c5ebf52d2ea82f9b4f804acc60fd502181bd597..ef100e7b233e26d276db9a3f9d9b5e8deab85a46 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -35,7 +35,7 @@ extern int aio_write _PARAMS((int, char *, int, off_t, int, aio_result_t *));
 extern int aio_close _PARAMS((int, aio_result_t *));
 extern int aio_stat _PARAMS((const char *, struct stat *, aio_result_t *));
 extern int aio_unlink _PARAMS((const char *, aio_result_t *));
-extern int aio_opendir _PARAMS((void));
+extern int aio_opendir _PARAMS((const char *, aio_result_t *));
 extern aio_result_t *aio_poll_done _PARAMS((void));