summaryrefslogtreecommitdiff
path: root/ace/OS.h
diff options
context:
space:
mode:
authorkitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-08-22 06:18:02 +0000
committerkitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-08-22 06:18:02 +0000
commit161f8e6515a7610d6a4124fdfb3dd1862064be6b (patch)
tree2437b354ce7d713baabbc64a8be27e8c9ee74271 /ace/OS.h
parent38b3f0f77f665fd67d42fd749cc166efe112b674 (diff)
downloadATCD-161f8e6515a7610d6a4124fdfb3dd1862064be6b.tar.gz
ChangeLogTag: Thu Aug 22 01:16:16 2002 Krishnakumar B <kitty@cs.wustl.edu>
Diffstat (limited to 'ace/OS.h')
-rw-r--r--ace/OS.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/ace/OS.h b/ace/OS.h
index 21db9f41dbf..ba9bae883de 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -4699,8 +4699,16 @@ public:
size_t size,
size_t nelems,
FILE *fp);
- static int feof (FILE* fp);
- static int ferror (FILE* fp);
+
+#if defined (feof)
+#undef feof
+#endif /* feof */
+ static int feof (FILE *fp);
+
+#if defined (ferror)
+#undef ferror
+#endif /* ferror */
+ static int ferror (FILE *fp);
static int fgetc (FILE* fp);
static void clearerr (FILE* fp);