From: Arnaud Giersch Date: Wed, 20 Jun 2012 13:18:02 +0000 (+0200) Subject: More cleanup! X-Git-Tag: v3_8~556^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2b86f38f9d331d921062c054ed5db7fba93c7583?hp=-c More cleanup! --- 2b86f38f9d331d921062c054ed5db7fba93c7583 diff --git a/src/win32/compiler/borland.h b/src/win32/compiler/borland.h deleted file mode 100644 index d58c6dcde6..0000000000 --- a/src/win32/compiler/borland.h +++ /dev/null @@ -1,412 +0,0 @@ -#ifndef __XBT_BORLAND_COMPILER_CONFIG_H__ -#define __XBT_BORLAND_COMPILER_CONFIG_H__ - -/* borland.h - simgrid config for Borland C++ Builder */ - -/* 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. */ - -/* - * Borland C++ compiler configuration - */ - -#include - -/* - * include files. - */ - -/* No header file. */ -#if defined(HAVE_DLFCN_H) -#undef HAVE_DLFCN_H -#endif - -/* Defined if the compiler has the header file. */ -#if !defined(HAVE_ERRNO_H) -#define HAVE_ERRNO_H 1 -#endif - -/* No header file. */ -#if defined(HAVE_EXECINFO_H) -#undef HAVE_EXECINFO_H -#endif - -/* No header file. */ -#if defined(HAVE_INTTYPES_H) -#undef HAVE_INTTYPES_H -#endif - -/* Defined if compiler has the header file. */ -#if !defined(HAVE_MEMORY_H) -#define HAVE_MEMORY_H 1 -#endif - -/* No header file. */ -#if defined(HAVE_PTHREAD_H) -#undef HAVE_PTHREAD_H -#endif - - -/* No header file. */ -#if defined(HAVE_STDINT_H) -#undef HAVE_STDINT_H -#endif - -/* The compiler has the header file. */ -#if !defined(HAVE_STDLIB_H) -#define HAVE_STDLIB_H 1 -#endif - -/* No header file. */ -#if defined(HAVE_STRINGS_H) -#undef HAVE_STRINGS_H -#endif - -/* The compiler has the header file. */ -#if !defined(HAVE_STRING_H) -#define HAVE_STRING_H 1 -#endif - -/* No header file. */ -#if defined(HAVE_SYS_SOCKET_H) -#undef HAVE_SYS_SOCKET_H -#endif - -/* The compiler has header file. */ -#if !defined(HAVE_SYS_STAT_H) -#define HAVE_SYS_STAT_H 1 -#endif - -/* No header file. */ -#if defined(HAVE_SYS_TIME_H) -#undef HAVE_SYS_TIME_H 1 -#endif - -/* The compiler has the header file. */ -#if !defined(HAVE_SYS_TYPES_H) -#define HAVE_SYS_TYPES_H 1 -#endif - -/* No header file. */ -#if defined(HAVE_UNISTD_H) -#undef HAVE_UNISTD_H -#endif - -/* - * The compiler has the header file. - * Process the case of afx.h -*/ -#if !defined(HAVE_WINDOWS_H) -#define HAVE_WINDOWS_H 1 -#endif - -/* The compiler has the header file. */ -#if !defined(HAVE_WINSOCK2_H) -#define HAVE_WINSOCK2_H -#endif - -/* - * The compiler has the header file. - * Trouble if winsock2.h exists ? - */ -#if !defined(HAVE_WINSOCK_H) -#define HAVE_WINSOCK_H 1 -#endif - -/* The compiler has the header file */ -#if !defined(HAVE_SIGNAL_H) -#define HAVE_SIGNAL_H 1 -#endif - -/* - * functions. - */ - -/* No `getcontext' function. */ -#if defined(HAVE_GETCONTEXT) -#undef HAVE_GETCONTEXT -#endif - -/* No `getdtablesize' function. */ -#if defined(HAVE_GETDTABLESIZE) -#undef HAVE_GETDTABLESIZE -#endif - -/* No `gettimeofday' function. */ -#if defined(HAVE_GETTIMEOFDAY) -#undef HAVE_GETTIMEOFDAY -#endif - -/* No `makecontext' function. */ -#if defined(HAVE_MAKECONTEXT) -#undef HAVE_MAKECONTEXT -#endif - -/* No 'popen' function. */ -#if defined(HAVE_POPEN) -#undef HAVE_POPEN -#endif - -/* No `readv' function. */ -#if defined(HAVE_READV) -#undef HAVE_READV -#endif - -/* No `setcontext' function. */ -#if defined(HAVE_SETCONTEXT) -#undef HAVE_SETCONTEXT -#endif - -/* No 'signal' function */ -#if defined(HAVE_SIGNAL) -#undef HAVE_SIGNAL -#endif - -/* The compiler has `snprintf' function. */ -#if !defined(HAVE_SNPRINTF) -#define HAVE_SNPRINTF 1 -#endif - -/* No `swapcontext' function. */ -#if defined(HAVE_SWAPCONTEXT) -#undef HAVE_SWAPCONTEXT -#endif - -/* No `sysconf' function. */ -#if defined(HAVE_SYSCONF) -#undef HAVE_SYSCONF -#endif - -/* No `nanosleep' function. */ -#if defined(HAVE_NANOSLEEP) -#undef HAVE_NANOSLEEP -#endif - -/* The compiler has the `vsnprintf' function. */ -#if !defined(HAVE_VSNPRINTF) -#define HAVE_VSNPRINTF 1 -#endif - -/* enable the asprintf replacement */ -#if !defined(NEED_ASPRINTF) -#define NEED_ASPRINTF 1 -#endif - -/*#ifdef NEED_ASPRINTF -#undef NEED_ASPRINTF -#endif*/ - - -/* enable the vasprintf replacement */ -#if !defined(NEED_VASPRINTF) -#define NEED_VASPRINTF 1 -#endif - -/* "disable the snprintf replacement ( this function is broken on system v only" */ - -/* FIXME TO ANALYZE */ -#if defined(PREFER_PORTABLE_SNPRINTF) -#undef PREFER_PORTABLE_SNPRINTF -#endif - -#if !defined(PREFER_PORTABLE_SNPRINTF) -#define PREFER_PORTABLE_SNPRINTF -#endif - -/* The maximal size of any scalar on this arch */ -#if !defined(SIZEOF_MAX) -#define SIZEOF_MAX 8 -#endif - -/* Define to 1 if you have the ANSI C header files. */ -#if !defined(STDC_HEADERS) -#define STDC_HEADERS 1 -#endif - -#if defined(TIME_WITH_SYS_TIME) -#undef TIME_WITH_SYS_TIME -#endif - -/* - * libraries - */ - -/* Define to 1 if you have the `pthread' library (-lpthread). */ -#if defined(HAVE_LIBPTHREAD) -#undef HAVE_LIBPTHREAD -#endif - -/* - * package informations ? - */ - - -/* Defined if arrays in struct can straddle struct alignment boundaries. This -is like than the structure compaction above, but this time, the argument to -be compacted is an array whom each element would be normally compacted. -Exemple: struct s { double d; int i; char c[6]; }; Arrays can straddle if c -is allowed to come just after i. Note that GRAS only support architecture -presenting this caracteristic so far. */ - -#if defined(GRAS_ARRAY_STRADDLE_STRUCT) -#undef GRAS_ARRAY_STRADDLE_STRUCT -#endif - -/* Defined if structures are compacted when possible. Consider this structure: -struct s {double d; int i; char c;}; If it is allowed, the char is placed -just after the int. If not, it has to be on the 8 bytes boundary imposed by -the double. For now, GRAS requires the structures to be compacted. */ -#if defined(GRAS_STRUCT_COMPACT) -#undef GRAS_STRUCT_COMPACT -#endif - -/* Name of package */ -#define PACKAGE "simgrid" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "simgrid-devel@lists.gforge.inria.fr" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "simgrid" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "simgrid 3.1.1-cvs" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "simgrid" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "3.1.1-cvs" - -/* - * macro - */ - - /* define if big endian */ -#if !defined(GRAS_BIGENDIAN) -#define GRAS_BIGENDIAN 0 -#endif - -/* Defined if structures are compacted when possible. Consider this structure: -struct s {double d; int i; char c;}; If it is allowed, the char is placed -just after the int. If not, it has to be on the 8 bytes boundary imposed by -the double. For now, GRAS requires the structures to be compacted. */ -#if defined(GRAS_STRUCT_COMPACT) -#define GRAS_STRUCT_COMPACT 1 -#endif - -/* defines the GRAS architecture signature of this machine */ -#if defined(GRAS_THISARCH) -#undef GRAS_THISARCH -#endif - -#define GRAS_THISARCH 0 - - - /* Path to the addr2line tool */ -#if defined(ADDR2LINE) -#undef ADDR2LINE -#endif - -#if !defined(HAVE_VA_COPY) -#define HAVE_VA_COPY 1 -#endif - -/* This macro is not defined in borland stdarg.h include file, adds it. */ -#define va_copy(dest,src) ((dest)=(src)) - -/* Predefined possible va_copy() implementation (id: ASP) */ -#define __VA_COPY_USE_ASP(d, s) do { *(d) = *(s); } while (0) - -/* Predefined possible va_copy() implementation (id: ASS) */ -#define __VA_COPY_USE_ASS(d, s) do { (d) = (s); } while (0) - -/* Predefined possible va_copy() implementation (id: C99) */ -#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))) - -/* Predefined possible va_copy() implementation (id: CPS) */ -#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)) - -/* Predefined possible va_copy() implementation (id: GCH) */ -#define __VA_COPY_USE_GCH(d, s) __va_copy((d), (s)) - -/* Predefined possible va_copy() implementation (id: GCM) */ -#define __VA_COPY_USE_GCM(d, s) VA_COPY((d), (s)) - - -/* Optional va_copy() implementation activation */ -#ifndef HAVE_VA_COPY -#define va_copy(d, s) __VA_COPY_USE(d, s) -#endif - - -/* Define to id of used va_copy() implementation */ -#define __VA_COPY_USE __VA_COPY_USE_C99 - -#ifndef _XBT_CALL -#if defined(_XBT_DESIGNATED_DLL) -#define _XBT_CALL __cdecl __export -#elif defined(_RTLDLL) -#define _XBT_CALL __cdecl __import -#else -#define _XBT_CALL __cdecl -#endif -#endif - -/* auto enable thread safety and exceptions: */ -#ifndef _CPPUNWIND -#define _XBT_HAS_NO_EXCEPTIONS -#endif - -#if defined ( __MT__ ) && !defined (_NOTHREADS) && !defined (_REENTRANT) -#define _REENTRANT 1 -#endif - -#if(__BORLANDC__>= 0x500) -#define _XBT_HAS_NAMESPACES -#endif - - -/* For open, read etc. file operations. */ -#include -#include - -/* For getpid() function. */ -#include - -/* no unistd.h header file. */ -#define YY_NO_UNISTD_H -/* - * Replace winsock2.h,ws2tcpip.h and winsock.h header files */ -#include - -/* types */ -typedef unsigned int uint32_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__ */ diff --git a/src/win32/compiler/select_compiler_features.h b/src/win32/compiler/select_compiler_features.h deleted file mode 100644 index b0812d58d7..0000000000 --- a/src/win32/compiler/select_compiler_features.h +++ /dev/null @@ -1,77 +0,0 @@ -#ifndef __XBT_SELECT_COMPILER_FEATURES_H__ -#define __XBT_SELECT_COMPILER_FEATURES_H__ - - -/* select_compiler_features.h - compiler features selection */ - -/* 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. */ - -#define _XBT_COMPILER_RESOLVED 0 - - -/* Borland compilers */ -#if defined (__BORLANDC__) -#define _XBT_COMPILER_NAME "Borland C/C++" -#define _XBT_COMPILER_VENDOR "Inprise Corporation" -#define _XBT_BORLAND_COMPILER 2 -/* version macro : __BORLANDC__ */ -/* version format : ? */ -#define _XBT_COMPILER_VERSION __BORLANDC__ -#define _XBT_COMPILER_VERSION_FORMAT "?" - -#undef _XBT_COMPILER_RESOLVED -#define _XBT_COMPILER_RESOLVED 1 -#endif - -/* Microsoft Visual C++ compiler */ -#if defined(_MSC_VER) -#define _XBT_VISUALC_COMPILER -#endif - - -/* GGG compilers */ - -#if defined(__GNUC__) -#if defined(__GNUC_PATCHLEVEL__) -#define __GNUC_VERSION__ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) -#else -#define __GNUC_VERSION__ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100) -#endif - -#define _XBT_COMPILER_NAME "GCC" -#define _XBT_COMPILER_VENDOR "GNU" -#define _XBT_GCC_COMPILER 2 -/* version macro : __GNUC_VERSION__ */ -/* version format : VVRRPP (VV = Version, RR = Revision, PP = Patch) */ -#define _XBT_COMPILER_VERSION __GNUC_VERSION__ -#define _XBT_COMPILER_VERSION_FORMAT "VVRRPP (VV = Version, RR = Revision, PP = Patch)" - -#undef _XBT_COMPILER_RESOLVED -#define _XBT_COMPILER_RESOLVED 1 -#endif - - - - -/* Returns the compiler name. */ -#define _xbt_get_compiler_name() _XBT_COMPILER_NAME - -/* Returns the compiler vendor. */ -#define _xbt_get_compiler_vendor() _XBT_COMPILER_VENDOR - -/* Returns 1 if the compiler is resolved (0 in the other case). */ -#define _xbt_is_compiler_resolved() _XBT_COMPILER_RESOLVED - -/* Returns the compiler version. */ -#define _xbt_get_compiler_version() _XBT_STRINGIZE(_XBT_COMPILER_VERSION) - -/* Returns the compiler version format. */ -#define _xbt_get_compiler_version_format() _XBT_COMPILER_VERSION_FORMAT - - - -#endif /* #ifndef __XBT_SELECT_FEATURES_COMPILER_H__ */ diff --git a/src/win32/compiler/visualc.h b/src/win32/compiler/visualc.h deleted file mode 100644 index 927349ed19..0000000000 --- a/src/win32/compiler/visualc.h +++ /dev/null @@ -1,438 +0,0 @@ -#ifndef __XBT_VISUALC_COMPILER_CONFIG_H__ -#define __XBT_VISUALC_COMPILER_CONFIG_H__ - -/* borland.h - simgrid config for Borland C++ Builder */ - -/* Copyright (c) 2007, 2008, 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. */ - -/* - * Borland C++ compiler configuration - */ - -#include - -#ifdef _WIN32_WINNT -#if _WIN32_WINNT < 0x0400 -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0400 -#endif -#else -#define _WIN32_WINNT 0x0400 -#endif - -/* - * include files. - */ - -/* No header file. */ -#if defined(HAVE_DLFCN_H) -#undef HAVE_DLFCN_H -#endif - -/* Defined if the compiler has the header file. */ -#if !defined(HAVE_ERRNO_H) -#define HAVE_ERRNO_H 1 -#endif - -/* No header file. */ -#if defined(HAVE_EXECINFO_H) -#undef HAVE_EXECINFO_H -#endif - -/* No header file. */ -#if defined(HAVE_INTTYPES_H) -#undef HAVE_INTTYPES_H -#endif - -/* Defined if compiler has the header file. */ -#if !defined(HAVE_MEMORY_H) -#define HAVE_MEMORY_H 1 -#endif - -/* No header file. */ -#if defined(HAVE_PTHREAD_H) -#undef HAVE_PTHREAD_H -#endif - - -/* No header file. */ -#if defined(HAVE_STDINT_H) -#undef HAVE_STDINT_H -#endif - -/* The compiler has the header file. */ -#if !defined(HAVE_STDLIB_H) -#define HAVE_STDLIB_H 1 -#endif - -/* No header file. */ -#if defined(HAVE_STRINGS_H) -#undef HAVE_STRINGS_H -#endif - -/* The compiler has the header file. */ -#if !defined(HAVE_STRING_H) -#define HAVE_STRING_H 1 -#endif - -/* No header file. */ -#if defined(HAVE_SYS_SOCKET_H) -#undef HAVE_SYS_SOCKET_H -#endif - -/* The compiler has header file. */ -#if !defined(HAVE_SYS_STAT_H) -#define HAVE_SYS_STAT_H 1 -#endif - -/* No header file. */ -#if defined(HAVE_SYS_TIME_H) -#undef HAVE_SYS_TIME_H 1 -#endif - -/* The compiler has the header file. */ -#if !defined(HAVE_SYS_TYPES_H) -#define HAVE_SYS_TYPES_H 1 -#endif - -/* No header file. */ -#if defined(HAVE_UNISTD_H) -#undef HAVE_UNISTD_H -#endif - -/* The compiler has the header file */ -#if !defined(HAVE_SIGNAL_H) -#define HAVE_SIGNAL_H 1 -#endif - -/* - * functions. - */ - -/* No `getcontext' function. */ -#if defined(HAVE_GETCONTEXT) -#undef HAVE_GETCONTEXT -#endif - -/* No `getdtablesize' function. */ -#if defined(HAVE_GETDTABLESIZE) -#undef HAVE_GETDTABLESIZE -#endif - -/* No `gettimeofday' function. */ -#if defined(HAVE_GETTIMEOFDAY) -#undef HAVE_GETTIMEOFDAY -#endif - -/* No `makecontext' function. */ -#if defined(HAVE_MAKECONTEXT) -#undef HAVE_MAKECONTEXT -#endif - -/* No 'popen' function. */ -#if defined(HAVE_POPEN) -#undef HAVE_POPEN -#endif - -/* No `readv' function. */ -#if defined(HAVE_READV) -#undef HAVE_READV -#endif - -/* No `setcontext' function. */ -#if defined(HAVE_SETCONTEXT) -#undef HAVE_SETCONTEXT -#endif - -/* No 'signal' function */ -#if defined(HAVE_SIGNAL) -#undef HAVE_SIGNAL -#endif - -/* "disable the snprintf replacement ( this function is broken on system v only" */ - - - -#ifdef PREFER_PORTABLE_SNPRINTF -# undef PREFER_PORTABLE_SNPRINTF 1 -#endif - - -/* The compiler has `snprintf' function. */ -#if _MSC_VER >= 1400 -# ifndef HAVE_SNPRINTF -# define HAVE_SNPRINTF 1 -# ifndef PREFER_PORTABLE_SNPRINTF -# define snprintf _snprintf -# endif -# endif -#else -# ifdef HAVE_SNPRINTF -#undef HAVE_SNPRINTF -# endif -#endif - - - -/* No `swapcontext' function. */ -#if defined(HAVE_SWAPCONTEXT) -#undef HAVE_SWAPCONTEXT -#endif - -/* No `sysconf' function. */ -#if defined(HAVE_SYSCONF) -#undef HAVE_SYSCONF -#endif - -/* No `nanosleep' function. */ -#if defined(HAVE_NANOSLEEP) -#undef HAVE_NANOSLEEP -#endif - -/* The compiler has the `vsnprintf' function. */ -#ifndef HAVE_VSNPRINTF -#define HAVE_VSNPRINTF 1 -#endif - - -/* disable the asprintf replacement */ -#ifndef NEED_ASPRINTF -#define NEED_ASPRINTF -#endif - - -/* disable the vasprintf replacement */ -#ifndef NEED_VASPRINTF -#define NEED_VASPRINTF -#endif - -/* The maximal size of any scalar on this arch */ -#if !defined(SIZEOF_MAX) -#define SIZEOF_MAX 8 -#endif - -/* Define to 1 if you have the ANSI C header files. */ -#if !defined(STDC_HEADERS) -#define STDC_HEADERS 1 -#endif - -#if defined(TIME_WITH_SYS_TIME) -#undef TIME_WITH_SYS_TIME -#endif - -/* - * libraries - */ - -/* Define to 1 if you have the `pthread' library (-lpthread). */ -#if defined(HAVE_LIBPTHREAD) -#undef HAVE_LIBPTHREAD -#endif - -/* - * package informations ? - */ - - -/* Defined if arrays in struct can straddle struct alignment boundaries. This -is like than the structure compaction above, but this time, the argument to -be compacted is an array whom each element would be normally compacted. -Exemple: struct s { double d; int i; char c[6]; }; Arrays can straddle if c -is allowed to come just after i. Note that GRAS only support architecture -presenting this caracteristic so far. */ - -#if defined(GRAS_ARRAY_STRADDLE_STRUCT) -#undef GRAS_ARRAY_STRADDLE_STRUCT -#endif - -/* Defined if structures are compacted when possible. Consider this structure: -struct s {double d; int i; char c;}; If it is allowed, the char is placed -just after the int. If not, it has to be on the 8 bytes boundary imposed by -the double. For now, GRAS requires the structures to be compacted. */ -#if defined(GRAS_STRUCT_COMPACT) -#undef GRAS_STRUCT_COMPACT -#endif - -/* Name of package */ -#define PACKAGE "simgrid" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "simgrid-devel@lists.gforge.inria.fr" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "simgrid" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "simgrid 3.1.1-cvs" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "simgrid" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "3.1.1-cvs" - -/* - * macro - */ - - /* define if big endian */ -#if !defined(GRAS_BIGENDIAN) -#define GRAS_BIGENDIAN 0 -#endif - -/* Defined if structures are compacted when possible. Consider this structure: -struct s {double d; int i; char c;}; If it is allowed, the char is placed -just after the int. If not, it has to be on the 8 bytes boundary imposed by -the double. For now, GRAS requires the structures to be compacted. */ -#if defined(GRAS_STRUCT_COMPACT) -#define GRAS_STRUCT_COMPACT 1 -#endif - -/* defines the GRAS architecture signature of this machine */ -#if defined(GRAS_THISARCH) -#undef GRAS_THISARCH -#endif - -#define GRAS_THISARCH 3 - - - /* Path to the addr2line tool */ -#if defined(ADDR2LINE) -#undef ADDR2LINE -#endif - - -#ifndef __VISUALC__ - -#if !defined(HAVE_VA_COPY) -#define HAVE_VA_COPY 1 -#endif - - /* This macro is not defined in borland stdarg.h include file, adds it. */ -#ifndef va_copy(dest,src) -#define va_copy(dest,src) ((dest)=(src)) -#endif - -#ifndef __VA_COPY_USE_ASP(d, s) - /* Predefined possible va_copy() implementation (id: ASP) */ -#define __VA_COPY_USE_ASP(d, s) do { *(d) = *(s); } while (0) -#endif - -#ifndef __VA_COPY_USE_ASS(d, s) - /* Predefined possible va_copy() implementation (id: ASS) */ -#define __VA_COPY_USE_ASS(d, s) do { (d) = (s); } while (0) -#endif - -#ifndef __VA_COPY_USE_C99(d, s) - /* Predefined possible va_copy() implementation (id: C99) */ -#define __VA_COPY_USE_C99(d, s) va_copy((d), (s)) -#endif - -#ifndef __VA_COPY_USE_CPP(d, s) - /* Predefined possible va_copy() implementation (id: CPP) */ -#define __VA_COPY_USE_CPP(d, s) memcpy((void *)(d), (void *)(s), sizeof(*(s))) -#endif - -#ifndef __VA_COPY_USE_CPS(d, s) - /* Predefined possible va_copy() implementation (id: CPS) */ -#define __VA_COPY_USE_CPS(d, s) memcpy((void *)&(d), (void *)&(s), sizeof(s)) -#endif - -#ifndef __VA_COPY_USE_GCB(d, s) - /* Predefined possible va_copy() implementation (id: GCB) */ -#define __VA_COPY_USE_GCB(d, s) __builtin_va_copy((d), (s)) -#endif - -#ifndef __VA_COPY_USE_GCH(d, s) - /* Predefined possible va_copy() implementation (id: GCH) */ -#define __VA_COPY_USE_GCH(d, s) __va_copy((d), (s)) -#endif - /* Predefined possible va_copy() implementation (id: GCM) */ -#define __VA_COPY_USE_GCM(d, s) VA_COPY((d), (s)) - - - /* Optional va_copy() implementation activation */ -#ifndef HAVE_VA_COPY -#define va_copy(d, s) __VA_COPY_USE(d, s) -#endif - - /* Define to id of used va_copy() implementation */ -#ifndef __VA_COPY_USE -#define __VA_COPY_USE __VA_COPY_USE_C99 -#endif -#endif - -/* xbt contexts are based on our threads implementation */ -#ifndef CONTEXT_THREADS -#define CONTEXT_THREADS 1 -#endif - - -/* xbt contexts are not based on ucontext */ -#ifdef CONTEXT_UCONTEXT -#undef CONTEXT_UCONTEXT -#endif - - -#ifndef _XBT_CALL -#if defined(_XBT_DESIGNATED_DLL) -#define _XBT_CALL __cdecl __export -#elif defined(_RTLDLL) -#define _XBT_CALL __cdecl __import -#else -#define _XBT_CALL __cdecl -#endif -#endif - -/* auto enable thread safety and exceptions: */ -#ifndef _CPPUNWIND -#define _XBT_HAS_NO_EXCEPTIONS -#endif - -#if defined ( __MT__ ) && !defined (_NOTHREADS) && !defined (_REENTRANT) -#define _REENTRANT 1 -#endif - - -/* For open, read etc. file operations. */ -#include -#include - -/* For getpid() function. */ -#include - -/* no unistd.h header file. */ -#define YY_NO_UNISTD_H -/* - * Replace winsock2.h,ws2tcpip.h and winsock.h header files */ -#include - - -/* Choose setjmp as exception implementation */ -#ifndef __EX_MCTX_SJLJ__ -#define __EX_MCTX_SJLJ__ -#endif - - - -#include - -#define S_IWUSR _S_IWRITE -#define S_IRUSR _S_IREAD - - -/* Visual C++ does not declare the ssize_t type */ -typedef int ssize_t; - -/* Visual C++ does not declare the mode_t type */ -typedef unsigned int mode_t; - -/* Visual C++ does not declare the uint32_t type */ -typedef unsigned int uint32_t; - - -#endif /* #ifndef __XBT_VISUALC_COMPILER_CONFIG_H__ */ diff --git a/src/win32/config.h b/src/win32/config.h deleted file mode 100644 index 0d374081e5..0000000000 --- a/src/win32/config.h +++ /dev/null @@ -1,88 +0,0 @@ -#ifndef __XBT_WIN32_CONFIG_H__ -#define __XBT_WIN32_CONFIG_H__ - - -/* config.h - simgrid config selection for windows platforms. */ - -/* Copyright (c) 2006, 2007, 2008, 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. */ - -/* - * config selection. -*/ -#include - - -#if defined(_XBT_BORLAND_COMPILER) -# include -#elif defined(__GNUC__) - /* data comes from autoconf when using gnuc (cross-compiling?) */ -# include "gras_config.h" -#ifndef _XBT_WIN32 -typedef unsigned int uint32_t; -#endif -#elif defined(_XBT_VISUALC_COMPILER) -# include -# else -# error "Unknown compiler - please report the problems to the main simgrid mailing list (http://gforge.inria.fr/mail/?group_id=12)" -#endif - -typedef int socklen_t; -#define tcp_read( s, buf, len ) recv( s, buf, len, 0 ) -#define tcp_write( s, buf, len ) send( s, buf, len, 0 ) -#define ioctl( s, c, a ) ioctlsocket( (s), (c), (a) ) -#define ioctl_t u_long -#define AC_SOCKET_INVALID ((unsigned int) ~0) - -#ifdef SD_BOTH -#define tcp_close(s) (shutdown( s, SD_BOTH ), closesocket(s)) -#else -#define tcp_close( s ) closesocket( s ) -#endif - -#ifndef _XBT_VISUALC_COMPILER -#ifndef EWOULDBLOCK -#define EWOULDBLOCK WSAEWOULDBLOCK -#endif -#ifndef EINPROGRESS -#define EINPROGRESS WSAEINPROGRESS -#endif -#ifndef ETIMEDOUT -#define ETIMEDOUT WSAETIMEDOUT -#endif -#endif - - - -#ifdef sock_errno -#undef sock_errno -#endif - -#define sock_errno WSAGetLastError() - -#ifdef sock_errstr -#undef sock_errstr -#endif - -#define sock_errstr(err) xbt_wsa_err2string(err) - -const char *xbt_wsa_err2string(int errcode); - -#ifdef S_IRGRP -#undef S_IRGRP -#endif - -#define S_IRGRP 0 - -#ifdef S_IWGRP -#undef S_IWGRP -#endif - -#define S_IWGRP 0 - - - -#endif /* #ifndef __XBT_WIN32_CONFIG_H__ */ diff --git a/src/win32/platform/select_platform_features.h b/src/win32/platform/select_platform_features.h deleted file mode 100644 index 6aaf3b92ca..0000000000 --- a/src/win32/platform/select_platform_features.h +++ /dev/null @@ -1,105 +0,0 @@ -#ifndef __XBT_SELECT_PLATFORM_FEATURES_H__ -#define __XBT_SELECT_PLATFORM_FEATURES_H__ - - -/* select_platform_features.h - platform features selection */ - -/* Copyright (c) 2006, 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. */ - -/* Windows platforms. */ - - -/* - * win32 or win64 (__XBT_WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC). -*/ - -/* If the platform is not resolved _XBT_PLATFORM_ID is set to zero. */ -#define _XBT_PLATFORM_ID 0 - - -#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__) -#undef _XBT_PLATFORM_ID -#define _XBT_WIN32_PLATFORM 1 -#define _XBT_PLATFORM_ID _XBT_WIN32_PLATFORM -#define _XBT_PLATFORM_NAME "Windows 32 bits platform" -/* - * win64. - */ -#elif defined(_WIN64) -#undef _XBT_PLATFORM_ID -#ifdef _XBT_WIN32_PLATFORM -#undef _XBT_WIN32_PLATFORM -#endif - -#define _XBT_PLATFORM_NAME "Windows 64 bits platform" -#define _XBT_WIN64_PLATFORM 2 -#define _XBT_PLATFORM_ID _XBT_WIN64_PLATFORM -/* - * win16. - */ -#elif defined(_WIN16) -#undef _XBT_PLATFORM_ID -#define _XBT_WIN16_PLATFORM 3 -#define _XBT_PLATFORM_NAME "Windows 16 bits platform" -#define _XBT_PLATFORM_ID _XBT_WIN16_PLATFORM -/* - * wince. - */ -#elif defined(UNDER_CE) -#undef _XBT_PLATFORM_ID -#define __XBT_WINCE_PLATFORM 4 -#define _XBT_PLATFORM_ID _XBT_WINCE_PLATFORM -#define _XBT_PLATFORM_NAME "Windows CE bits platform" - -#elif defined(linux) || defined(__linux) || defined(__linux__) -/* linux. */ -#undef _XBT_PLATFORM_ID -#define __XBT_LINUX_PLATFORM 5 -#define _XBT_PLATFORM_ID _XBT_LINUX_PLATFORM -#define _XBT_PLATFORM_NAME "Linux platform" - -#elif defined (_XBT_ASSERT_CONFIG) - // This must come last - generate an error if we don't - // resolve the platform: -#error "Unknown platform - please configure (simgrid.gforge.inria.fr/xbt/libs/config/config.htm#configuring) and report the results to the main simgrid mailing list (simgrid.gforge.inra.fr/more/mailing_lists.htm#main)" -#endif - -#if defined(_XBT_WIN32_PLATFORM) || defined(_XBT_WIN64_PLATFORM) || defined(_XBT_WIN16_PLATFORM) || defined(_XBT_WINCE_PLATFORM) -#ifndef _XBT_WIN32 -#define _XBT_WIN32 -#endif -#endif - - -/* Returns true if the platform is resolved, false in the other case. */ -#define _xbt_is_platform_resolved() (_XBT_PLATFORM_ID != 0) - -/* Returns the platform name. */ -#define _xbt_get_platform_name() _XBT_PLATFORM_NAME - -/* Returns the platform id. */ -#define _xbt_get_platform_id() _XBT_PLATFORM_ID - -/* Returns true if the platform is Windows 32 bits. */ -#define _xbt_is_win32() (_XBT_PLATFORM_ID == 1) - -/* Returns true if the platform is Windows 64 bits. */ -#define _xbt_is_win64() (_XBT_PLATFORM_ID == 2) - -/* Returns true if the platform is Windows 16 bits. */ -#define _xbt_is_win16() (_XBT_PLATFORM_ID == 3) - -/* Returns true if the platform is Windows CE. */ -#define _xbt_is_wince() (_XBT_PLATFORM_ID == 4) - -/* Returns true if the platform is linux. */ -#define _xbt_is_linux() (_XBT_PLATFORM_ID == 5) - - - - -#endif /* #define __XBT_SELECT_PLATFORM_FEATURES_H__ */