From b5e582ab2e3d739814ccfbb0cf4d2ac8078985a5 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 6 Mar 2016 09:26:32 +0100 Subject: [PATCH] try to not specify any calling convention on windows --- include/xbt/base.h | 13 ------------- src/simix/smx_global.cpp | 5 ++--- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/include/xbt/base.h b/include/xbt/base.h index f79b495bf6..8365b1dbb1 100644 --- a/include/xbt/base.h +++ b/include/xbt/base.h @@ -154,19 +154,6 @@ a16, a15, a14, a13, a12, a11, a10, a9, \ a8, a7, a6, a5, a4, a3, a2, a1, N, ...) N -/* - * Function calling convention (not used for now) - * http://unixwiz.net/techtips/win32-callconv.html <-- good documentation - */ - -#ifdef _WIN32 -# ifndef _XBT_CALL -# define _XBT_CALL __cdecl -# endif -#else -# define _XBT_CALL -#endif - /* Handle import/export stuff * * Rational of XBT_PUBLIC: diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 1bea3ddd2a..1b898468a2 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -40,8 +40,7 @@ #endif XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories"); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, - "Logging specific to SIMIX (kernel)"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)"); smx_global_t simix_global = NULL; static xbt_heap_t simix_timers = NULL; @@ -63,7 +62,7 @@ static void SIMIX_synchro_mallocator_reset_f(void* synchro); #include int _sg_do_verbose_exit = 1; -static void _XBT_CALL inthandler(int ignored) +static void inthandler(int ignored) { if ( _sg_do_verbose_exit ) { XBT_INFO("CTRL-C pressed. The current status will be displayed before exit (disable that behavior with option 'verbose-exit')."); -- 2.20.1