2004-07-21  Joerg Wunsch <address@hidden>

	* libc/stdio/fputs_p.c: replace PRG_RDB by pgm_read_byte
	* libc/stdio/puts_p.c: Ditto.
	* libc/stdio/vfprintf.c: Ditto.
	* libc/stdio/vfscanf.c: Ditto.

Index: libc/stdio/fputs_p.c
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/libc/stdio/fputs_p.c,v
retrieving revision 1.2
diff -u -u -r1.2 fputs_p.c
--- libc/stdio/fputs_p.c	26 Dec 2002 21:48:13 -0000	1.2
+++ libc/stdio/fputs_p.c	21 Jul 2004 20:50:50 -0000
@@ -43,7 +43,7 @@
 	if ((stream->flags & __SWR) == 0)
 		return EOF;
 
-	while ((c = PRG_RDB(str++)) != '\0')
+	while ((c = pgm_read_byte(str++)) != '\0')
 		if (stream->put(c) != 0)
 			rv = EOF;
 
Index: libc/stdio/puts_p.c
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/libc/stdio/puts_p.c,v
retrieving revision 1.2
diff -u -u -r1.2 puts_p.c
--- libc/stdio/puts_p.c	26 Dec 2002 21:48:13 -0000	1.2
+++ libc/stdio/puts_p.c	21 Jul 2004 20:50:50 -0000
@@ -43,7 +43,7 @@
 	if ((stdout->flags & __SWR) == 0)
 		return EOF;
 
-	while ((c = PRG_RDB(str++)) != '\0')
+	while ((c = pgm_read_byte(str++)) != '\0')
 		if (stdout->put(c) != 0)
 			rv = EOF;
 	if (stdout->put('\n') != 0)
Index: libc/stdio/vfprintf.c
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/libc/stdio/vfprintf.c,v
retrieving revision 1.7
diff -u -u -r1.7 vfprintf.c
--- libc/stdio/vfprintf.c	12 Feb 2004 20:59:00 -0000	1.7
+++ libc/stdio/vfprintf.c	21 Jul 2004 20:50:51 -0000
@@ -138,7 +138,7 @@
 	if ((stream->flags & __SWR) == 0)
 		return EOF;
 
-	while ((c = ((stream->flags & __SPGM)? PRG_RDB(fmt++): *fmt++))) {
+	while ((c = ((stream->flags & __SPGM)? pgm_read_byte(fmt++): *fmt++))) {
 		if (flags & FLHASPERCENT) {
 			if (c >= '0' && c <= '9') {
 #if PRINTF_LEVEL > PRINTF_MIN
Index: libc/stdio/vfscanf.c
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/libc/stdio/vfscanf.c,v
retrieving revision 1.4
diff -u -u -r1.4 vfscanf.c
--- libc/stdio/vfscanf.c	5 Apr 2004 18:03:52 -0000	1.4
+++ libc/stdio/vfscanf.c	21 Jul 2004 20:50:52 -0000
@@ -120,7 +120,7 @@
 	if ((stream->flags & __SRD) == 0)
 		return EOF;
 
-	while ((c = ((stream->flags & __SPGM)? PRG_RDB(fmt++): *fmt++))) {
+	while ((c = ((stream->flags & __SPGM)? pgm_read_byte(fmt++): *fmt++))) {
 #if SCANF_LEVEL >= SCANF_FLT
 		if (flags & FLBRACKET) {
 			if (c == '^' && i == 0 && !(flags & FLNEGATE)) {