From b26315cf24c674176bb53a7f2552ddaa6058c8ce Mon Sep 17 00:00:00 2001 From: vraatikka Date: Thu, 27 Jun 2013 16:54:54 +0300 Subject: [PATCH] Can't compile product version. --- log_manager/log_manager.cc | 4 ++-- utils/skygw_debug.h | 6 +++--- utils/skygw_utils.cc | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc index 0527aa5f4..ae3816fef 100644 --- a/log_manager/log_manager.cc +++ b/log_manager/log_manager.cc @@ -1221,7 +1221,7 @@ static void* thr_filewriter_fun( mlist_node_t* node; mlist_node_t* prev_node; int i; - bool succp; + ss_debug(bool succp;) thr = (skygw_thread_t *)data; fwr = (filewriter_t *)skygw_thread_get_data(thr); @@ -1263,7 +1263,7 @@ static void* thr_filewriter_fun( wb = (logfile_writebuf_t*)node->mlnode_data; writep = wb->wb_buf; nbytes = strlen(writep); - succp = skygw_file_write(file, (void *)writep, nbytes); + ss_debug(succp = )skygw_file_write(file, (void *)writep, nbytes); ss_dassert(succp); prev_node = node; node = node->mlnode_next; diff --git a/utils/skygw_debug.h b/utils/skygw_debug.h index b0af6ec9c..c579cc888 100644 --- a/utils/skygw_debug.h +++ b/utils/skygw_debug.h @@ -76,9 +76,9 @@ # define ss_debug(exp) # define ss_dfprintf(a, b, ...) -# define ss_dfflush -# define ss_dfwrite -# define ss_dassert +# define ss_dfflush(s) +# define ss_dfwrite(a, b, c, d) +# define ss_dassert(exp) # define ss_info_dassert(exp, info) #endif /* SS_DEBUG */ diff --git a/utils/skygw_utils.cc b/utils/skygw_utils.cc index 285e2bd1d..46d42c84b 100644 --- a/utils/skygw_utils.cc +++ b/utils/skygw_utils.cc @@ -64,7 +64,7 @@ struct skygw_thread_st { pthread_t sth_parent; pthread_t sth_thr; int sth_errno; -#if defined(SS_DEBUG) +#if defined(DEBUG) skygw_thr_state_t sth_state; #endif char* sth_name; @@ -916,7 +916,7 @@ void skygw_thread_done( CHK_THREAD(th); ss_dassert(th->sth_state == THR_STOPPED); ss_debug(th->sth_state = THR_DONE;) - simple_mutex_done(th->sth_mutex); + simple_mutex_done(th->sth_mutex); thread_free_memory(th, th->sth_name); } }