Merge pull request #5166 from keszybz/gcc7
Fixes for gcc 7 and new µhttpd & glibc warnings
This commit is contained in:
@@ -69,9 +69,9 @@ uint32_t MurmurHash2 ( const void * key, int len, uint32_t seed )
|
||||
|
||||
switch(len)
|
||||
{
|
||||
case 3: h ^= data[2] << 16;
|
||||
case 2: h ^= data[1] << 8;
|
||||
case 1: h ^= data[0];
|
||||
case 3: h ^= data[2] << 16; /* fall through */
|
||||
case 2: h ^= data[1] << 8; /* fall through */
|
||||
case 1: h ^= data[0]; /* fall through */
|
||||
h *= m;
|
||||
};
|
||||
|
||||
|
||||
@@ -27,6 +27,10 @@
|
||||
|
||||
#define NSS_SIGNALS_BLOCK SIGALRM,SIGVTALRM,SIGPIPE,SIGCHLD,SIGTSTP,SIGIO,SIGHUP,SIGUSR1,SIGUSR2,SIGPROF,SIGURG,SIGWINCH
|
||||
|
||||
#ifndef DEPRECATED_RES_USE_INET6
|
||||
# define DEPRECATED_RES_USE_INET6 0x00002000
|
||||
#endif
|
||||
|
||||
#define NSS_GETHOSTBYNAME_PROTOTYPES(module) \
|
||||
enum nss_status _nss_##module##_gethostbyname4_r( \
|
||||
const char *name, \
|
||||
@@ -92,7 +96,7 @@ enum nss_status _nss_##module##_gethostbyname_r( \
|
||||
int *errnop, int *h_errnop) { \
|
||||
enum nss_status ret = NSS_STATUS_NOTFOUND; \
|
||||
\
|
||||
if (_res.options & RES_USE_INET6) \
|
||||
if (_res.options & DEPRECATED_RES_USE_INET6) \
|
||||
ret = _nss_##module##_gethostbyname3_r( \
|
||||
name, \
|
||||
AF_INET6, \
|
||||
|
||||
@@ -127,18 +127,25 @@ void siphash24_compress(const void *_in, size_t inlen, struct siphash *state) {
|
||||
switch (left) {
|
||||
case 7:
|
||||
state->padding |= ((uint64_t) in[6]) << 48;
|
||||
/* fall through */
|
||||
case 6:
|
||||
state->padding |= ((uint64_t) in[5]) << 40;
|
||||
/* fall through */
|
||||
case 5:
|
||||
state->padding |= ((uint64_t) in[4]) << 32;
|
||||
/* fall through */
|
||||
case 4:
|
||||
state->padding |= ((uint64_t) in[3]) << 24;
|
||||
/* fall through */
|
||||
case 3:
|
||||
state->padding |= ((uint64_t) in[2]) << 16;
|
||||
/* fall through */
|
||||
case 2:
|
||||
state->padding |= ((uint64_t) in[1]) << 8;
|
||||
/* fall through */
|
||||
case 1:
|
||||
state->padding |= ((uint64_t) in[0]);
|
||||
/* fall through */
|
||||
case 0:
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1271,7 +1271,7 @@ bool clock_supported(clockid_t clock) {
|
||||
if (!clock_boottime_supported())
|
||||
return false;
|
||||
|
||||
/* fall through, after checking the cached value for CLOCK_BOOTTIME. */
|
||||
/* fall through */
|
||||
|
||||
default:
|
||||
/* For everything else, check properly */
|
||||
|
||||
Reference in New Issue
Block a user