Imported Upstream version 1.0.0 upstream/1.0.0

1 files changed, 17 insertions, 15 deletions

diff --git a/src/nm-dhcp4-config.h b/src/nm-dhcp4-config.h
index 6eb9ee57..227d4481 100644
--- a/src/nm-dhcp4-config.h
+++ b/src/nm-dhcp4-config.h
@@ -18,44 +18,46 @@
  * Copyright (C) 2008 Red Hat, Inc.
  */
 
-#ifndef NM_DHCP4_CONFIG_H
-#define NM_DHCP4_CONFIG_H
+#ifndef __NETWORKMANAGER_DHCP4_CONFIG_H__
+#define __NETWORKMANAGER_DHCP4_CONFIG_H__
 
 #include <glib.h>
 #include <glib-object.h>
 
+#include "nm-types.h"
+
 #define NM_TYPE_DHCP4_CONFIG            (nm_dhcp4_config_get_type ())
-#define NM_DHCP4_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP4_CONFIG, NMDHCP4Config))
-#define NM_DHCP4_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP4_CONFIG, NMDHCP4ConfigClass))
+#define NM_DHCP4_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP4_CONFIG, NMDhcp4Config))
+#define NM_DHCP4_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP4_CONFIG, NMDhcp4ConfigClass))
 #define NM_IS_DHCP4_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP4_CONFIG))
 #define NM_IS_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP4_CONFIG))
-#define NM_DHCP4_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP4_CONFIG, NMDHCP4ConfigClass))
+#define NM_DHCP4_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP4_CONFIG, NMDhcp4ConfigClass))
 
-typedef struct {
+struct _NMDhcp4Config {
 	GObject parent;
-} NMDHCP4Config;
+};
 
 typedef struct {
 	GObjectClass parent;
 
-} NMDHCP4ConfigClass;
+} NMDhcp4ConfigClass;
 
 #define NM_DHCP4_CONFIG_OPTIONS "options"
 
 GType nm_dhcp4_config_get_type (void);
 
-NMDHCP4Config *nm_dhcp4_config_new (void);
+NMDhcp4Config *nm_dhcp4_config_new (void);
 
-const char *nm_dhcp4_config_get_dbus_path (NMDHCP4Config *config);
+const char *nm_dhcp4_config_get_dbus_path (NMDhcp4Config *config);
 
-void nm_dhcp4_config_add_option (NMDHCP4Config *config,
+void nm_dhcp4_config_add_option (NMDhcp4Config *config,
                                  const char *key,
                                  const char *option);
 
-void nm_dhcp4_config_reset (NMDHCP4Config *config);
+void nm_dhcp4_config_reset (NMDhcp4Config *config);
 
-const char *nm_dhcp4_config_get_option (NMDHCP4Config *config, const char *option);
+const char *nm_dhcp4_config_get_option (NMDhcp4Config *config, const char *option);
 
-GSList *nm_dhcp4_config_list_options (NMDHCP4Config *config);
+GSList *nm_dhcp4_config_list_options (NMDhcp4Config *config);
 
-#endif /* NM_DHCP4_CONFIG_H */
+#endif /* __NETWORKMANAGER_DHCP4_CONFIG_H__ */