colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tivial/core: move common #defines to header file

Browse Source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2014-03-04 14:30:01 +01:00
parent 4f7b1cabc0
commit 8cd0de231a
3 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/nm-device.c
View File

@@ -74,14 +74,6 @@
#include "nm-device-bond.h" #include "nm-device-bond.h"
#include "nm-device-team.h" #include "nm-device-team.h"
/* workaround for older libnl version, that does not define these flags. */
#ifndef IFA_F_MANAGETEMPADDR
#define IFA_F_MANAGETEMPADDR 0x100
#endif
#ifndef IFA_F_NOPREFIXROUTE
#define IFA_F_NOPREFIXROUTE 0x200
#endif
static void impl_device_disconnect (NMDevice *device, DBusGMethodInvocation *context); static void impl_device_disconnect (NMDevice *device, DBusGMethodInvocation *context);
#include "nm-device-glue.h" #include "nm-device-glue.h"

8
src/platform/nm-platform.c
View File

@@ -33,14 +33,6 @@
#include "nm-logging.h" #include "nm-logging.h"
#include "nm-enum-types.h" #include "nm-enum-types.h"
/* workaround for older libnl version, that does not define these flags. */
#ifndef IFA_F_MANAGETEMPADDR
#define IFA_F_MANAGETEMPADDR 0x100
#endif
#ifndef IFA_F_NOPREFIXROUTE
#define IFA_F_NOPREFIXROUTE 0x200
#endif
#define debug(...) nm_log_dbg (LOGD_PLATFORM, __VA_ARGS__) #define debug(...) nm_log_dbg (LOGD_PLATFORM, __VA_ARGS__)
#define NM_PLATFORM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_PLATFORM, NMPlatformPrivate)) #define NM_PLATFORM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_PLATFORM, NMPlatformPrivate))

8
src/platform/nm-platform.h
View File

@@ -36,6 +36,14 @@
/******************************************************************/ /******************************************************************/
/* workaround for older libnl version, that does not define these flags. */
#ifndef IFA_F_MANAGETEMPADDR
#define IFA_F_MANAGETEMPADDR 0x100
#endif
#ifndef IFA_F_NOPREFIXROUTE
#define IFA_F_NOPREFIXROUTE 0x200
#endif
typedef enum { typedef enum {
/* no error specified, sometimes this means the arguments were wrong */ /* no error specified, sometimes this means the arguments were wrong */
NM_PLATFORM_ERROR_NONE, NM_PLATFORM_ERROR_NONE,