aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Johnston <jjohnstn@redhat.com>2006-05-23 19:57:31 +0000
committerJeff Johnston <jjohnstn@redhat.com>2006-05-23 19:57:31 +0000
commit8eeee74e95b6028fab171d21748e61e0d247f971 (patch)
tree0b80547719f86c9c4f6fa760726d4594436edf86
parent13220d1a70ff627055d4951f02d5d83c752d5e6b (diff)
downloadnewlib-8eeee74e95b6028fab171d21748e61e0d247f971.zip
newlib-8eeee74e95b6028fab171d21748e61e0d247f971.tar.gz
newlib-8eeee74e95b6028fab171d21748e61e0d247f971.tar.bz2
2006-05-23 Jeff Johnston <jjohnstn@redhat.com>
* libc/include/stdio.h: Protect dprintf prototype with #ifndef dprintf so as to not interfere with historical code defining their own dprintf macro.
-rw-r--r--newlib/ChangeLog6
-rw-r--r--newlib/libc/include/stdio.h2
2 files changed, 8 insertions, 0 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index fd98f5d..f204e61 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-23 Jeff Johnston <jjohnstn@redhat.com>
+
+ * libc/include/stdio.h: Protect dprintf prototype
+ with #ifndef dprintf so as to not interfere with
+ historical code defining their own dprintf macro.
+
2006-05-18 Jeff Johnston <jjohnstn@redhat.com>
* libc/include/stdio.h: Add prototypes for fiscanf,
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index 7f16527..5fc2f4b 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -229,7 +229,9 @@ off_t _EXFUN(ftello, ( FILE *));
#ifndef _REENT_ONLY
int _EXFUN(asiprintf, (char **, const char *, ...));
int _EXFUN(asprintf, (char **, const char *, ...));
+#ifndef dprintf
int _EXFUN(dprintf, (int, const char *, ...));
+#endif
int _EXFUN(fcloseall, (_VOID));
int _EXFUN(fiprintf, (FILE *, const char *, ...));
int _EXFUN(fiscanf, (FILE *, const char *, ...));