update for HEAD-2003021201

[reactos.git] / include / msvcrt / conio.h

diff --git a/include/msvcrt/conio.h b/include/msvcrt/conio.h
index db012be..4403d06 100644 (file)
--- a/include/msvcrt/conio.h
+++ b/include/msvcrt/conio.h
@@ -16,7 +16,7 @@
  *
  *  This code is distributed in the hope that it will be useful but
  *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warranties of
+ *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
  * $Revision$
@@ -25,43 +25,39 @@
  *
  */
 
-#ifndef        __STRICT_ANSI__
+#ifndef __STRICT_ANSI__
 
-#ifndef        _CONIO_H_
-#define        _CONIO_H_
+#ifndef _CONIO_H_
+#define _CONIO_H_
 
-#ifdef __cplusplus
+#ifdef  __cplusplus
 extern "C" {
 #endif
 
 
-char*  _cgets (char* szBuffer);
-int    _cprintf (const char* szFormat, ...);
-int    _cputs (const char* szString);
-int    _cscanf (char* szFormat, ...);
+char* _cgets(char*);
+int _cprintf(const char*, ...);
+int _cputs(const char*); 
+int _cscanf(char*, ...);
+int _getch(void);
+int _getche(void);
+int _kbhit(void);
+int _putch(int);
+int _ungetch(int);
 
-int    _getch (void);
-int    _getche (void);
-int    _kbhit (void);
-int    _putch (int cPut);
-int    _ungetch (int cUnget);
+#ifndef _NO_OLDNAMES
+#define getch           _getch
+#define getche          _getche
+#define kbhit           _kbhit
+#define putch(cPut)     _putch(cPut)
+#define ungetch(cUnget) _ungetch(cUnget)
+#endif  /* Not _NO_OLDNAMES */
 
 
-#ifndef        _NO_OLDNAMES
-
-#define        getch                   _getch
-#define        getche                  _getche
-#define        kbhit                   _kbhit
-#define        putch(cPut)             _putch(cPut)
-#define        ungetch(cUnget)         _ungetch(cUnget)
-
-#endif /* Not _NO_OLDNAMES */
-
-
-#ifdef __cplusplus
+#ifdef  __cplusplus
 }
 #endif
 
-#endif /* Not _CONIO_H_ */
+#endif  /* Not _CONIO_H_ */
 
-#endif /* Not __STRICT_ANSI__ */
+#endif  /* Not __STRICT_ANSI__ */