fixed bug in stdio.h

svn path=/trunk/; revision=258

diff --git a/reactos/include/conio.h b/reactos/include/conio.h
index 3c0b26b..60733bb 100644 (file)
--- a/reactos/include/conio.h
+++ b/reactos/include/conio.h
@@ -59,43 +59,59 @@ enum COLORS {
 
 #define BLINK   0x80    /*  blink bit   */
 
-void    blinkvideo(void);
-char *  cgets(char *_str); 
-void    clreol(void);
-void    clrscr(void);
-int     _conio_kbhit(void); /* checks for ungetch char */
-//int     cprintf(const char *_format, ...) __attribute__((format(printf,1,2)));
-int     cputs(const char *_str);
-//int     cscanf(const char *_format, ...) __attribute__((format(scanf,1,2)));
-void    delline(void);
-int     getch(void);
-int     getche(void);
-int     gettext(int _left, int _top, int _right, int _bottom, void *_destin);
-void    gettextinfo(struct text_info *_r);
-void    gotoxy(int _x, int _y);
-void    gppconio_init(void);
-void    highvideo(void);
-void    insline(void);
-void   intensevideo(void);
-void    lowvideo(void);
-int     movetext(int _left, int _top, int _right, int _bottom, int _destleft, int _desttop);
-void    normvideo(void);
-int     putch(int _c);
-int     puttext(int _left, int _top, int _right, int _bottom, void *_source);
-void    _setcursortype(int _type);
-void    _set_screen_lines(int _nlines);
-void    textattr(int _attr);
-void    textbackground(int _color);
-void    textcolor(int _color);
-void    textmode(int _mode);
-int     ungetch(int); 
-unsigned int     wherex(void);
-unsigned int    wherey(void);
-void    window(int _left, int _top, int _right, int _bottom);
-
-#define kbhit _conio_kbhit /* Who ever includes gppconio.h probably
-                              also wants _conio_kbhit and not kbhit
-                              from libc */
+//void    blinkvideo(void);
+char *  _cgets(char *_str); 
+//void    clreol(void);
+//void    clrscr(void);
+int     _kbhit(void); /* checks for ungetch char */
+int     _cprintf(const char *_format, ...) __attribute__((format(printf,1,2)));
+int     _cputs(const char *_str);
+int     _cscanf(const char *_format, ...) __attribute__((format(scanf,1,2)));
+//void    delline(void);
+int     _getch(void);
+int     _getche(void);
+//int     gettext(int _left, int _top, int _right, int _bottom, void *_destin);
+//void    gettextinfo(struct text_info *_r);
+//void    gotoxy(int _x, int _y);
+//void    gppconio_init(void);
+//void    highvideo(void);
+//void    insline(void);
+//void intensevideo(void);
+//void    lowvideo(void);
+//int     movetext(int _left, int _top, int _right, int _bottom, int _destleft, int _desttop);
+//void    normvideo(void);
+int     _putch(int _c);
+//int     puttext(int _left, int _top, int _right, int _bottom, void *_source);
+//void    _setcursortype(int _type);
+//void    _set_screen_lines(int _nlines);
+//void    textattr(int _attr);
+//void    textbackground(int _color);
+//void    textcolor(int _color);
+//void    textmode(int _mode);
+int     _ungetch(int); 
+//unsigned int     wherex(void);
+//unsigned int    wherey(void);
+//void    window(int _left, int _top, int _right, int _bottom);
+
+
+int _inp(unsigned short p);
+unsigned short _inpw(unsigned short p);
+unsigned long _inpd(unsigned short p);
+int _outp(unsigned short p, int i);
+unsigned short _outpw(unsigned short p, unsigned short w);
+unsigned long _outpd(unsigned short p, unsigned long d);
+
+#define cgets          _cgets
+#define cprintf        _cprintf
+#define cputs          _cputs
+#define cscanf         _cscanf
+#define getch          _getch
+#define getche         _getche
+#define kbhit          _kbhit
+#define putch          _putch
+#define ungetch        _ungetch
+
+
 
 #endif /* !_POSIX_SOURCE */
 #endif /* !__STRICT_ANSI__ */

diff --git a/reactos/include/direct.h b/reactos/include/direct.h
index 3500254..dcf9461 100644 (file)
--- a/reactos/include/direct.h
+++ b/reactos/include/direct.h
@@ -9,19 +9,20 @@ struct _diskfree_t {
 };
 
 
+int _chdir(const char *_path);
 int _chdrive( int drive );
-int _getdrive( void );
 char *_getcwd( char *buffer, int maxlen );
-
-int _chdir(const char *_path);
-char *_getcwd(char *, int);
+int _getdrive( void );
+unsigned int   _getdiskfree(unsigned int _drive, struct _diskfree_t *_diskspace);
 int  _mkdir(const char *_path);
 int  _rmdir(const char *_path);
-unsigned int   _getdiskfree(unsigned int _drive, struct _diskfree_t *_diskspace);
-#define chdir _chdir
-#define getcwd _getcwd
-#define mkdir _mkdir
-#define rmdir _rmdir
 
 
-#endif
\ No newline at end of file
+#define chdir          _chdir
+#define chdrive        _chdrive
+#define getcwd                 _getcwd
+#define mkdir          _mkdir
+#define rmdir          _rmdir
+
+
+#endif

diff --git a/reactos/include/stdio.h b/reactos/include/stdio.h
index cfc8bae..6800789 100644 (file)
--- a/reactos/include/stdio.h
+++ b/reactos/include/stdio.h
@@ -10,6 +10,7 @@ extern "C" {
 #ifndef __dj_ENFORCE_ANSI_FREESTANDING
 
 #include <sys/djtypes.h>
+
   
 #define _IOFBF         00001
 #define _IONBF         00002
@@ -44,7 +45,6 @@ extern "C" {
 
 #include <internal/types.h>
 
-typedef void *va_list;
 
 #ifndef _FILE_DEFINED
 typedef struct {