[ros-diffs] [sginsberg] 37709: - Use stdarg.h from psdk so we don't get redefinition conflicts

sginsberg at svn.reactos.org sginsberg at svn.reactos.org
Fri Nov 28 21:18:13 CET 2008


Author: sginsberg
Date: Fri Nov 28 14:18:13 2008
New Revision: 37709

URL: http://svn.reactos.org/svn/reactos?rev=37709&view=rev
Log:
- Use stdarg.h from psdk so we don't get redefinition conflicts

Modified:
    trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/stdarg.h

Modified: trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/stdarg.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/stdarg.h?rev=37709&r1=37708&r2=37709&view=diff
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/stdarg.h [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/stdarg.h [iso-8859-1] Fri Nov 28 14:18:13 2008
@@ -36,34 +36,7 @@
 #ifndef _STDARG_H_
 #define	_STDARG_H_
 
-#ifdef _MSC_VER
+/* Use psdk */
 #include <stdarg.h>
-#else
-
-typedef char *va_list;
-
-#ifdef __GNUC__
-#define va_start(AP, LASTARG) 						\
- (AP = ((va_list) __builtin_next_arg (LASTARG)))
-#else
-#define	__va_promote(type) \
-	(((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
-
-#define	va_start(ap, last) \
-	(ap = ((va_list)&(last) + __va_promote(last)))
-#endif
-
-#ifdef KERNEL
-#define	va_arg(ap, type) \
-	((type *)(ap += sizeof(type)))[-1]
-#else
-#define	va_arg(ap, type) \
-	((type *)(ap += sizeof(type) < sizeof(int) ? \
-		(abort(), 0) : sizeof(type)))[-1]
-#endif
-
-#define	va_end(ap)
-
-#endif
 
 #endif /* !_STDARG_H_ */



More information about the Ros-diffs mailing list