Index: src/libvortex-1.1.def =================================================================== --- src/libvortex-1.1.def (revision 3231) +++ src/libvortex-1.1.def (working copy) @@ -223,10 +223,7 @@ vortex_connection_unlock_channel_pool vortex_connection_unref vortex_ctx_free -vortex_ctx_get -vortex_ctx_global vortex_ctx_new -vortex_ctx_set vortex_dtds_cleanup vortex_dtds_get_channel_dtd vortex_dtds_get_sasl_dtd @@ -236,7 +233,6 @@ vortex_errno_get_last_error vortex_errno_show_error vortex_errno_show_last_error -vortex_exit vortex_exit_ctx vortex_frame_are_equal vortex_frame_are_joinable @@ -305,7 +301,6 @@ vortex_hash_replace vortex_hash_replace_full vortex_hash_size -vortex_init vortex_init_ctx vortex_io_init vortex_io_waiting_get_current Index: src/vortex.c =================================================================== --- src/vortex.c (revision 3231) +++ src/vortex.c (working copy) @@ -622,14 +622,13 @@ ctx->debug_handler (file, line, log_level, message, args); } else { /* printout the process pid */ +ctx_not_defined: #if defined (__GNUC__) if (vortex_color_log_is_enabled (ctx)) fprintf (stdout, "\e[1;36m(proc %d)\e[0m: ", getpid ()); - else { + else #endif /* __GNUC__ */ - ctx_not_defined: - fprintf (stdout, "(proc %d): ", getpid ()); - } + fprintf (stdout, "(proc %d): ", getpid ()); /* drop a log according to the level */ #if defined (__GNUC__) Index: src/vortex.h =================================================================== --- src/vortex.h (revision 3231) +++ src/vortex.h (working copy) @@ -255,13 +255,8 @@ # define vortex_log(l, m, ...) do{_vortex_log (ctx, __AXL_FILE__, __AXL_LINE__, l, m, ##__VA_ARGS__);}while(0) # define vortex_log2(l, m, ...) do{_vortex_log2 (ctx, __AXL_FILE__, __AXL_LINE__, l, m, ##__VA_ARGS__);}while(0) #else -# if defined(AXL_OS_WIN32) && ! defined(__GNUC__) -# define vortex_log _vortex_log -# define vortex_log2 _vortex_log2 -# else -# define vortex_log(l, m, ...) /* nothing */ -# define vortex_log2(l, m, message, ...) /* nothing */ -# endif +# define vortex_log(l, m, ...) /* nothing */ +# define vortex_log2(l, m, message, ...) /* nothing */ #endif /** Index: src/vortex_channel_pool.c =================================================================== --- src/vortex_channel_pool.c (revision 3231) +++ src/vortex_channel_pool.c (working copy) @@ -139,7 +139,7 @@ VortexChannel * __vortex_channel_pool_add_channels (VortexChannelPool * pool, int init_num, axlPointer user_data) { int iterator = 0; - VortexChannel * channel = NULL;; + VortexChannel * channel = NULL; VortexCtx * ctx = vortex_connection_get_ctx (pool->connection); /* start channels */