mirror of
				https://gitlab.alpinelinux.org/alpine/aports.git
				synced 2025-10-31 08:21:49 +01:00 
			
		
		
		
	
		
			
				
	
	
		
			62 lines
		
	
	
		
			1.7 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			62 lines
		
	
	
		
			1.7 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| --- qtwebengine/src/3rdparty/chromium/net/dns/dns_reloader.cc	2016-11-07 15:46:18.000000000 +0100
 | |
| +++ qtwebengine/src/3rdparty/chromium/net/dns/dns_reloader.cc	2016-12-20 03:33:11.749059656 +0100
 | |
| @@ -9,6 +9,10 @@
 | |
|  
 | |
|  #include <resolv.h>
 | |
|  
 | |
| +#if !defined(__GLIBC__)
 | |
| +#include "resolv_compat.h"
 | |
| +#endif
 | |
| +
 | |
|  #include "base/lazy_instance.h"
 | |
|  #include "base/logging.h"
 | |
|  #include "base/macros.h"
 | |
| --- qtwebengine/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc	2016-11-07 15:46:18.000000000 +0100
 | |
| +++ qtwebengine/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc	2016-12-20 03:40:07.671953098 +0100
 | |
| @@ -6,6 +6,10 @@
 | |
|  
 | |
|  #include <string>
 | |
|  
 | |
| +#if !defined(__GLIBC__)
 | |
| +#include "resolv_compat.h"
 | |
| +#endif
 | |
| +
 | |
|  #include "base/bind.h"
 | |
|  #include "base/files/file.h"
 | |
|  #include "base/files/file_path.h"
 | |
| diff --git a/src/3rdparty/chromium/net/dns/resolv_compat.h b/src/3rdparty/chromium/net/dns/resolv_compat.h
 | |
| new file mode 100644
 | |
| index 0000000..4f0e852
 | |
| --- /dev/null
 | |
| +++ b/src/3rdparty/chromium/net/dns/resolv_compat.h
 | |
| @@ -0,0 +1,29 @@
 | |
| +#if !defined(__GLIBC__)
 | |
| +/***************************************************************************
 | |
| + * resolv_compat.h
 | |
| + *
 | |
| + * Mimick GLIBC's res_ninit() and res_nclose() for musl libc
 | |
| + * Note: res_init() is actually deprecated according to
 | |
| + * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html
 | |
| + **************************************************************************/
 | |
| +#include <string.h>
 | |
| +
 | |
| +static inline int res_ninit(res_state statp)
 | |
| +{
 | |
| +	int rc = res_init();
 | |
| +	if (statp != &_res) {
 | |
| +		memcpy(statp, &_res, sizeof(*statp));
 | |
| +	}
 | |
| +	return rc;
 | |
| +}
 | |
| +
 | |
| +static inline int res_nclose(res_state statp)
 | |
| +{
 | |
| +	if (!statp)
 | |
| +		return -1;
 | |
| +	if (statp != &_res) {
 | |
| +		memset(statp, 0, sizeof(*statp));
 | |
| +	}
 | |
| +	return 0;
 | |
| +}
 | |
| +#endif
 |