Merge branch 'hholzgra-hartmut-compile-warnings' into release-1.0beta-refresh

Conflicts:
	server/include/dcb.h

Resolved
This commit is contained in:
Mark Riddoch
2014-09-19 17:37:39 +01:00
2 changed files with 8 additions and 8 deletions

View File

@ -72,9 +72,9 @@ void skygw_logmanager_exit(void);
* free private write buffer list
*/
void skygw_log_done(void);
int skygw_log_write(logfile_id_t id, char* format, ...);
int skygw_log_write(logfile_id_t id, const char* format, ...);
int skygw_log_flush(logfile_id_t id);
int skygw_log_write_flush(logfile_id_t id, char* format, ...);
int skygw_log_write_flush(logfile_id_t id, const char* format, ...);
int skygw_log_enable(logfile_id_t id);
int skygw_log_disable(logfile_id_t id);