* sysdeps/ieee754/dbl-64/mpa.c: Include <sys/param.h>.

	* sysdeps/ieee754/dbl-64/mpa.h (MAX, MIN): Macros removed.

	* stdio-common/tst-popen.c: Include <string.h>.

	* resolv/res_send.c (__libc_res_nsend): Only define TMPBUF #if DEBUG.

5 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f4b74e3..58cd9b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2004-08-11  Jakub Jelinek  <jakub@redhat.com>
 
+	* sysdeps/ieee754/dbl-64/mpa.c: Include <sys/param.h>.
+	* sysdeps/ieee754/dbl-64/mpa.h (MAX, MIN): Macros removed.
+
+	* stdio-common/tst-popen.c: Include <string.h>.
+
+	* resolv/res_send.c (__libc_res_nsend): Only define TMPBUF #if DEBUG.
+
 	* sysdeps/pthread/aio_misc.c (handle_fildes_io): Remove noreturn
 	attribute.  Return NULL instead of calling pthread_exit at the end.
 
diff --git a/resolv/res_send.c b/resolv/res_send.c
index 54f74d4..2366f59 100644
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -577,7 +577,9 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
 		}
 
 #ifdef _LIBC
+# ifdef DEBUG
 		char tmpbuf[40];
+# endif
 		Dprint(statp->options & RES_DEBUG,
 		       (stdout, ";; Querying server (# %d) address = %s\n",
 			ns + 1, inet_ntop(AF_INET6, &nsap->sin6_addr,
diff --git a/stdio-common/tst-popen.c b/stdio-common/tst-popen.c
index 980cf93..4bfdf2d 100644
--- a/stdio-common/tst-popen.c
+++ b/stdio-common/tst-popen.c
@@ -18,6 +18,7 @@
    02111-1307 USA.  */
 
 #include <stdio.h>
+#include <string.h>
 #include <wchar.h>
 
 static int
diff --git a/sysdeps/ieee754/dbl-64/mpa.c b/sysdeps/ieee754/dbl-64/mpa.c
index acd7c41..68647ba 100644
--- a/sysdeps/ieee754/dbl-64/mpa.c
+++ b/sysdeps/ieee754/dbl-64/mpa.c
@@ -47,6 +47,7 @@
 #include "endian.h"
 #include "mpa.h"
 #include "mpa2.h"
+#include <sys/param.h>	/* For MIN() */
 /* mcr() compares the sizes of the mantissas of two multiple precision  */
 /* numbers. Mantissas are compared regardless of the signs of the       */
 /* numbers, even if x->d[0] or y->d[0] are zero. Exponents are also     */
diff --git a/sysdeps/ieee754/dbl-64/mpa.h b/sysdeps/ieee754/dbl-64/mpa.h
index d14a070..4aec48e 100644
--- a/sysdeps/ieee754/dbl-64/mpa.h
+++ b/sysdeps/ieee754/dbl-64/mpa.h
@@ -63,8 +63,6 @@ typedef union { int i[2]; double d; } number;
 #define  EY  y->e
 #define  EZ  z->e
 
-#define MAX(x,y) ((x) < (y) ?  (y) : (x))
-#define MIN(x,y) ((x) < (y) ?  (x) : (y))
 #define ABS(x)   ((x) <  0  ? -(x) : (x))
 
 int __acr(const mp_no *, const mp_no *, int);