mirror of https://github.com/OpenIPC/firmware.git
				
				
				
			Merge branch 'master' of github:OpenIPC/firmware
						commit
						f1114834a7
					
				|  | @ -1,3 +1,16 @@ | |||
| diff --git a/buffer.c b/buffer.c
 | ||||
| index 822d97a5..646763b4 100644
 | ||||
| --- a/buffer.c
 | ||||
| +++ b/buffer.c
 | ||||
| @@ -3070,7 +3070,7 @@ evbuffer_file_segment_materialize(struct evbuffer_file_segment *seg)
 | ||||
|  			offset_leftover = offset % page_size; | ||||
|  			offset_rounded = offset - offset_leftover; | ||||
|  		} | ||||
| -		mapped = mmap(NULL, length + offset_leftover,
 | ||||
| +		mapped = mmap64(NULL, length + offset_leftover,
 | ||||
|  		    PROT_READ, | ||||
|  #ifdef MAP_NOCACHE | ||||
|  		    MAP_NOCACHE | /* ??? */ | ||||
| diff --git a/bufferevent_mbedtls.c b/bufferevent_mbedtls.c
 | ||||
| index f42da2ae..61f448a2 100644
 | ||||
| --- a/bufferevent_mbedtls.c
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue