From c2de0d98ba39e0a1a970d066fd19be786092f376 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Tue, 1 Mar 2016 16:55:22 +0100
Subject: Imported Upstream version 1.1.91

---
 src/ppp-manager/nm-ppp-manager.c | 7 +++----
 src/ppp-manager/nm-pppd-plugin.c | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/ppp-manager')

diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
index 10bc0fec..1578e595 100644
--- a/src/ppp-manager/nm-ppp-manager.c
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -19,7 +19,7 @@
  * Copyright (C) 2008 - 2012 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -42,7 +42,6 @@
 #include <linux/if.h>
 #include <linux/if_ppp.h>
 
-#include "nm-default.h"
 #include "NetworkManagerUtils.h"
 #include "nm-ppp-manager.h"
 #include "nm-platform.h"
@@ -66,8 +65,8 @@ typedef struct {
 	NMActRequestGetSecretsCallId secrets_id;
 	const char *secrets_setting_name;
 
-	guint32 ppp_watch_id;
-	guint32 ppp_timeout_handler;
+	guint ppp_watch_id;
+	guint ppp_timeout_handler;
 
 	/* Monitoring */
 	char *ip_iface;
diff --git a/src/ppp-manager/nm-pppd-plugin.c b/src/ppp-manager/nm-pppd-plugin.c
index 1f1016ae..be4dd185 100644
--- a/src/ppp-manager/nm-pppd-plugin.c
+++ b/src/ppp-manager/nm-pppd-plugin.c
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
+#define ___CONFIG_H__
 
 #include <string.h>
 #include <pppd/pppd.h>
-- 
cgit 1.3.0-6-gf8a5