From 2c032d8f1c6292c1338a615e6ec40252889ba85c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 22 Jan 2015 00:29:39 +0100 Subject: Imported Upstream version 1.0.0 --- src/devices/nm-device-generic.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/devices/nm-device-generic.h') diff --git a/src/devices/nm-device-generic.h b/src/devices/nm-device-generic.h index e7b7090b..c889b1dd 100644 --- a/src/devices/nm-device-generic.h +++ b/src/devices/nm-device-generic.h @@ -18,8 +18,8 @@ * Copyright 2013 Red Hat, Inc. */ -#ifndef NM_DEVICE_GENERIC_H -#define NM_DEVICE_GENERIC_H +#ifndef __NETWORKMANAGER_DEVICE_GENERIC_H__ +#define __NETWORKMANAGER_DEVICE_GENERIC_H__ #include @@ -34,13 +34,6 @@ G_BEGIN_DECLS #define NM_IS_DEVICE_GENERIC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_GENERIC)) #define NM_DEVICE_GENERIC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_GENERIC, NMDeviceGenericClass)) -typedef enum -{ - NM_DEVICE_GENERIC_ERROR_CONNECTION_NOT_GENERIC = 0, /*< nick=ConnectionNotGeneric >*/ - NM_DEVICE_GENERIC_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ - NM_DEVICE_GENERIC_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ -} NMDeviceGenericError; - #define NM_DEVICE_GENERIC_TYPE_DESCRIPTION "type-description" typedef struct { -- cgit 1.3.0-6-gf8a5