Fix misbalanced parentheses in checks for va_copy. [Arnaud Giersch]

[simgrid.git] / src / win32 / compiler / borland.h

diff --git a/src/win32/compiler/borland.h b/src/win32/compiler/borland.h
index 5230c6e..89d944b 100644 (file)
--- a/src/win32/compiler/borland.h
+++ b/src/win32/compiler/borland.h
@@ -3,7 +3,8 @@
 
 /* borland.h - simgrid config for Borland C++ Builder   */
 
-/* Copyright (c) 2003, 2004 Cherier Malek. All rights reserved.            */
+/* Copyright (c) 2006, 2007, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -327,10 +328,10 @@ the double. For now, GRAS requires the structures to be compacted. */
 #define __VA_COPY_USE_C99(d, s) va_copy((d), (s))
 
 /* Predefined possible va_copy() implementation (id: CPP) */
-#define __VA_COPY_USE_CPP(d, s) memcpy((void *)(d), (void *)(s)), sizeof(*(s))
+#define __VA_COPY_USE_CPP(d, s) memcpy((void *)(d), (void *)(s), sizeof(*(s)))
 
 /* Predefined possible va_copy() implementation (id: CPS) */
-#define __VA_COPY_USE_CPS(d, s) memcpy((void *)&(d), (void *)&(s)), sizeof((s))
+#define __VA_COPY_USE_CPS(d, s) memcpy((void *)&(d), (void *)&(s), sizeof(s))
 
 /* Predefined possible va_copy() implementation (id: GCB) */
 #define __VA_COPY_USE_GCB(d, s) __builtin_va_copy((d), (s))
@@ -390,7 +391,6 @@ the double. For now, GRAS requires the structures to be compacted. */
 
 /* types */
 typedef unsigned int uint32_t;
-typedef int socklen_t;
 
 /* Choose setjmp as exception implementation */
 #ifndef __EX_MCTX_SJLJ__