src/libqmi-glib/qmi-net-port-manager-rmnet.c | 18 ++++++++++++++++++

 utils/qmidb/qmidb.py                         |  2 +-

 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/libqmi-glib/qmi-net-port-manager-rmnet.c b/src/libqmi-glib/qmi-net-port-manager-rmnet.c

index efca1fe..e295fcd 100644

--- a/src/libqmi-glib/qmi-net-port-manager-rmnet.c

+++ b/src/libqmi-glib/qmi-net-port-manager-rmnet.c

@@ -92,7 +92,16 @@ typedef struct {

 static NetlinkHeader *

 netlink_message_header (NetlinkMessage *msg)

 {

+/* On armh this produced a warning:

+ * cast increases required alignment of target type

+ * But structs nlmsghdr and ifinfomsg seems aligned

+ * (there is padding in them),

+ * so don't treat this warning as error.

+ */

+#pragma GCC diagnostic push

+#pragma GCC diagnostic warning "-Wcast-align"

     return (NetlinkHeader *) (msg->data);

+#pragma GCC diagnostic pop

 }

 static guint

@@ -393,8 +402,17 @@ netlink_message_cb (GSocket                *socket,

     }

     buffer_len = (unsigned int ) bytes_received;

+/* On armh this produced a warning:

+ * cast increases required alignment of target type

+ * But struct nlmsghdr seems aligned

+ * (there is padding in it),

+ * so don't treat this warning as error.

+ */

+#pragma GCC diagnostic push

+#pragma GCC diagnostic warning "-Wcast-align"

     for (hdr = (struct nlmsghdr *) buf; NLMSG_OK (hdr, buffer_len);

          NLMSG_NEXT (hdr, buffer_len)) {

+#pragma GCC diagnostic pop

         Transaction     *tr;

         struct nlmsgerr *err;

diff --git a/utils/qmidb/qmidb.py b/utils/qmidb/qmidb.py

index f970931..91042f4 100755

--- a/utils/qmidb/qmidb.py

+++ b/utils/qmidb/qmidb.py

@@ -1,4 +1,4 @@

-#!/usr/bin/env python

+#!/usr/bin/env python3

 # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-

 #

 # This program is free software; you can redistribute it and/or modify it under