Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2

[tpg/acess2.git] / Usermode / include / stdio.h

diff --git a/Usermode/include/stdio.h b/Usermode/include/stdio.h
index 1223fe8..be4f20a 100644 (file)
--- a/Usermode/include/stdio.h
+++ b/Usermode/include/stdio.h
@@ -1,44 +1,48 @@
-/*\r
- * AcessOS LibC\r
- * stdlib.h\r
- */\r
-#ifndef __STDIO_H\r
+/*
+ * AcessOS LibC
+ * stdlib.h
+ */
+#ifndef __STDIO_H
 #define __STDIO_H
-\r
-#include <stdlib.h>\r
-#include <stdarg.h>\r
-\r
-// === Types ===
+
+#include <stdlib.h>
+#include <stdarg.h>
+
+/* === Types === */
 typedef struct sFILE   FILE;
-\r
-// === CONSTANTS ===\r
-#define EOF    (-1)\r
-\r
-// --- Standard IO ---\r
-extern int     printf(const char *format, ...);\r
-extern int     vsnprintf(char *buf, size_t __maxlen, const char *format, va_list args);\r
-extern int     vsprintf(char *buf, const char *format, va_list args);\r
-extern int     sprintf(char *buf, const char *format, ...);\r
-\r
-extern FILE    *fopen(const char *file, const char *mode);\r
-extern FILE    *freopen(const char *file, const char *mode, FILE *fp);\r
+
+/* === CONSTANTS === */
+#define EOF    (-1)
+#define BUFSIZ 1024
+
+/* --- Standard IO --- */
+extern int     printf(const char *format, ...);
+extern int     vsnprintf(char *buf, size_t __maxlen, const char *format, va_list args);
+extern int     vsprintf(char *buf, const char *format, va_list args);
+extern int     sprintf(char *buf, const char *format, ...);
+extern int     snprintf(char *buf, size_t maxlen, const char *format, ...);
+
+extern FILE    *fopen(const char *file, const char *mode);
+extern FILE    *freopen(const char *file, const char *mode, FILE *fp);
 extern FILE    *fdopen(int fd, const char *modes);
-extern void fclose(FILE *fp);\r
-extern void fflush(FILE *fp);\r
-extern long int        ftell(FILE *fp);\r
-extern int     fseek(FILE *fp, long int amt, int whence);\r
-\r
-extern size_t  fread(void *buf, size_t size, size_t n, FILE *fp);\r
-extern size_t  fwrite(void *buf, size_t size, size_t n, FILE *fp);\r
-extern int     fgetc(FILE *fp);\r
-extern int     fputc(int ch, FILE *fp);\r
-\r
-extern int     fprintf(FILE *fp, const char *format, ...);\r
-extern int     vfprintf(FILE *fp, const char *format, va_list args);\r
-\r
-extern FILE    *stdin;\r
-extern FILE    *stdout;\r
-extern FILE    *stderr;\r
-
-#endif\r
+extern int     fclose(FILE *fp);
+extern void    fflush(FILE *fp);
+extern off_t   ftell(FILE *fp);
+extern int     fseek(FILE *fp, long int amt, int whence);
+
+extern size_t  fread(void *buf, size_t size, size_t n, FILE *fp);
+extern size_t  fwrite(void *buf, size_t size, size_t n, FILE *fp);
+extern int     fgetc(FILE *fp);
+extern int     fputc(int ch, FILE *fp);
+extern int     getchar(void);
+extern int     putchar(int ch);
+
+extern int     fprintf(FILE *fp, const char *format, ...);
+extern int     vfprintf(FILE *fp, const char *format, va_list args);
+
+extern FILE    *stdin;
+extern FILE    *stdout;
+extern FILE    *stderr;
+
+#endif