X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/019c6cc7b4c17dc45b74168e9ef1086e75ea1232..ab58f88f92ff03857b6cea328043a63619dc2ba7:/src/win32/compiler/borland.h diff --git a/src/win32/compiler/borland.h b/src/win32/compiler/borland.h index 939e26532e..89d944bcc5 100644 --- 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)) @@ -347,10 +348,6 @@ the double. For now, GRAS requires the structures to be compacted. */ #define va_copy(d, s) __VA_COPY_USE(d, s) #endif -#ifdef USE_UCONTEXT -#undef USE_UCONTEXT -#endif - /* Define to id of used va_copy() implementation */ #define __VA_COPY_USE __VA_COPY_USE_C99 @@ -394,11 +391,22 @@ 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__ #define __EX_MCTX_SJLJ__ #endif +/* this is used in context managment. */ +#ifdef CONTEXT_UCONTEXT +#undef CONTEXT_UCONTEXT +#endif + +#ifndef CONTEXT_THREADS +#define CONTEXT_THREADS 1 +#endif + + + + #endif /* #ifndef __XBT_BORLAND_COMPILER_CONFIG_H__ */