From 047d3bf96b510740f64687480333c378e414995f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 31 Mar 2017 15:57:05 -0700 Subject: [PATCH 1/5] adjust net/ headers for musl compatibility Signed-off-by: Khem Raj --- libnm-core/nm-utils.c | 12 +++++++----- libnm-core/nm-utils.h | 5 ++--- src/platform/wifi/wifi-utils.h | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index df75d56..868224e 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -19,24 +19,26 @@ * Copyright 2005 - 2014 Red Hat, Inc. */ -#include "nm-default.h" - -#include "nm-utils.h" - #include #include #include -#include #include #include #include #include #include +//#include +//#include +#include + +#include "nm-default.h" +#include "nm-utils.h" #if WITH_JANSSON #include #endif + #include "nm-common-macros.h" #include "nm-utils-private.h" #include "nm-setting-private.h" diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h index 407c14e..156ccae 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h @@ -27,11 +27,10 @@ #include -#include - /* For ETH_ALEN and INFINIBAND_ALEN */ -#include +//#include #include +#include #include "nm-core-enum-types.h" #include "nm-setting-wireless-security.h" diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h index 8e2b93f..84f5ce9 100644 --- a/src/platform/wifi/wifi-utils.h +++ b/src/platform/wifi/wifi-utils.h @@ -22,7 +22,7 @@ #ifndef __WIFI_UTILS_H__ #define __WIFI_UTILS_H__ -#include +//#include #include "nm-dbus-interface.h" -- 2.12.1