From e152ec7bf4ba252ff9d3eb13eabd417b931dac9a Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Mon, 24 Sep 2018 09:29:55 +0100 Subject: Import Upstream version 1.12.2 --- libnm/nm-dhcp6-config.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'libnm/nm-dhcp6-config.h') diff --git a/libnm/nm-dhcp6-config.h b/libnm/nm-dhcp6-config.h index 2d6568e1..3c18f5ec 100644 --- a/libnm/nm-dhcp6-config.h +++ b/libnm/nm-dhcp6-config.h @@ -21,9 +21,11 @@ #ifndef __NM_DHCP6_CONFIG_H__ #define __NM_DHCP6_CONFIG_H__ -#include "nm-dhcp-config.h" +#if !((NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE) +#error Cannot use this header. +#endif -G_BEGIN_DECLS +#include "nm-dhcp-config.h" #define NM_TYPE_DHCP6_CONFIG (nm_dhcp6_config_get_type ()) #define NM_DHCP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP6_CONFIG, NMDhcp6Config)) @@ -40,13 +42,8 @@ typedef struct { typedef struct { NMDhcpConfigClass parent; - - /*< private >*/ - gpointer padding[4]; } NMDhcp6ConfigClass; GType nm_dhcp6_config_get_type (void); -G_END_DECLS - #endif /* __NM_DHCP6_CONFIG_H__ */ -- cgit 1.3.0-6-gf8a5