branch update for HEAD-2003021201

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

diff --git a/include/msvcrt/stdarg.h b/include/msvcrt/stdarg.h
index 77694ae..265ad6f 100644 (file)
--- a/include/msvcrt/stdarg.h
+++ b/include/msvcrt/stdarg.h
@@ -23,7 +23,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$
@@ -48,7 +48,7 @@
 #define _VA_LIST_DEFINED
 #endif
 
-#ifndef        _VA_LIST
+#ifndef _VA_LIST
 #define _VA_LIST
 typedef char* va_list;
 #endif
@@ -58,31 +58,33 @@ typedef char* va_list;
  * Amount of space required in an argument list (ie. the stack) for an
  * argument of type t.
  */
-#define __va_argsiz(t) \
-       (((sizeof(t) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
+#define __va_argsiz(t) \
+    (((sizeof(t) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
 
 
 /*
  * Start variable argument list processing by setting AP to point to the
  * argument after pN.
  */
-#ifdef __GNUC__
+#ifdef  __GNUC__
 /*
  * In GNU the stack is not necessarily arranged very neatly in order to
  * pack shorts and such into a smaller argument list. Fortunately a
  * neatly arranged version is available through the use of __builtin_next_arg.
  */
 #ifndef va_start
-#define va_start(ap, pN)       \
-       ((ap) = ((va_list) __builtin_next_arg(pN)))
+#define va_start(ap, pN) \
+    ((ap) = ((va_list) __builtin_next_arg(pN)))
 #endif
 #else
 /*
  * For a simple minded compiler this should work (it works in GNU too for
  * vararg lists that don't follow shorts and such).
  */
-#define va_start(ap, pN)       \
-       ((ap) = ((va_list) (&pN) + __va_argsiz(pN)))
+#ifndef va_start
+#define va_start(ap, pN) \
+    ((ap) = ((va_list) (&pN) + __va_argsiz(pN)))
+#endif
 #endif
 
 
@@ -90,9 +92,9 @@ typedef char* va_list;
  * End processing of variable argument list. In this case we do nothing.
  */
 #ifndef va_end
-#define va_end(ap)     ((void)0)
+#define va_end(ap)  ((void)0)
 #endif
-       
+
 
 /*
  * Increment ap to the next argument in the list while returing a
@@ -103,12 +105,11 @@ typedef char* va_list;
  */
 
 #ifndef va_arg
-#define va_arg(ap, t)                                  \
-        (((ap) = (ap) + __va_argsiz(t)),               \
-         *((t*) (void*) ((ap) - __va_argsiz(t))))
+#define va_arg(ap, t) \
+    (((ap) = (ap) + __va_argsiz(t)), \
+    *((t*) (void*) ((ap) - __va_argsiz(t))))
 #endif
-       
+
 #endif /* Not RC_INVOKED */
 
 #endif /* not _STDARG_H_ */
-