The internal header directory conflicted with in-source builds causing a build failure. This is fixed by renaming the internal header directory to something other than maxscale. The renaming pointed out a few problems in a couple of source files that appeared to include internal headers when the headers were in fact public headers. Fixed maxctrl in-source builds by making the copying of the sources optional.
		
			
				
	
	
		
			35 lines
		
	
	
		
			670 B
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			35 lines
		
	
	
		
			670 B
		
	
	
	
		
			C++
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (c) 2016 MariaDB Corporation Ab
 | 
						|
 *
 | 
						|
 * Use of this software is governed by the Business Source License included
 | 
						|
 * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
 | 
						|
 *
 | 
						|
 * Change Date: 2020-01-01
 | 
						|
 *
 | 
						|
 * On the date above, in accordance with the Business Source License, use
 | 
						|
 * of this software will be governed by version 2 or later of the General
 | 
						|
 * Public License.
 | 
						|
 */
 | 
						|
 | 
						|
#include <maxscale/maxscale.h>
 | 
						|
 | 
						|
#include <time.h>
 | 
						|
#include "internal/maxscale.h"
 | 
						|
 | 
						|
static time_t started;
 | 
						|
 | 
						|
void maxscale_reset_starttime(void)
 | 
						|
{
 | 
						|
    started = time(0);
 | 
						|
}
 | 
						|
 | 
						|
time_t maxscale_started(void)
 | 
						|
{
 | 
						|
    return started;
 | 
						|
}
 | 
						|
 | 
						|
int maxscale_uptime()
 | 
						|
{
 | 
						|
    return time(0) - started;
 | 
						|
}
 |