New upstream version 1.10.8 upstream/1.10.8

1 files changed, 8 insertions, 9 deletions

diff --git a/shared/nm-utils/siphash24.c b/shared/nm-utils/siphash24.c
index 8e59afb2..3a5a635d 100644
--- a/shared/nm-utils/siphash24.c
+++ b/shared/nm-utils/siphash24.c
@@ -19,8 +19,7 @@
 
 #include "nm-default.h"
 
-#define assert(cond)   nm_assert (cond)
-#define _fallthrough_  _nm_fallthrough
+#define assert(cond) nm_assert (cond)
 
 #include <stdio.h>
 
@@ -131,25 +130,25 @@ void siphash24_compress(const void *_in, size_t inlen, struct siphash *state) {
         switch (left) {
                 case 7:
                         state->padding |= ((uint64_t) in[6]) << 48;
-                        _fallthrough_;
+                        /* fall through */
                 case 6:
                         state->padding |= ((uint64_t) in[5]) << 40;
-                        _fallthrough_;
+                        /* fall through */
                 case 5:
                         state->padding |= ((uint64_t) in[4]) << 32;
-                        _fallthrough_;
+                        /* fall through */
                 case 4:
                         state->padding |= ((uint64_t) in[3]) << 24;
-                        _fallthrough_;
+                        /* fall through */
                 case 3:
                         state->padding |= ((uint64_t) in[2]) << 16;
-                        _fallthrough_;
+                        /* fall through */
                 case 2:
                         state->padding |= ((uint64_t) in[1]) <<  8;
-                        _fallthrough_;
+                        /* fall through */
                 case 1:
                         state->padding |= ((uint64_t) in[0]);
-                        _fallthrough_;
+                        /* fall through */
                 case 0:
                         break;
         }