summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Davidson <james.davidson@vyatta.com>2013-01-07 09:24:29 -0800
committerJames Davidson <james.davidson@vyatta.com>2013-01-07 09:24:29 -0800
commitb550ff683e379086e2253d4aaaf11aafbc9fe6d7 (patch)
tree6b1827e9213fcdcc45fb9abdc9b510c528996a9a
parentde9faed3a96180d879aedb341df6da3bfe811c84 (diff)
downloadvyatta-cfg-b550ff683e379086e2253d4aaaf11aafbc9fe6d7.tar.gz
vyatta-cfg-b550ff683e379086e2253d4aaaf11aafbc9fe6d7.zip
Fix compiler warnings
-rw-r--r--src/commit2.cpp4
-rw-r--r--src/dump_session.c2
-rw-r--r--src/exe_action.c2
-rw-r--r--src/priority.c2
4 files changed, 4 insertions, 6 deletions
diff --git a/src/commit2.cpp b/src/commit2.cpp
index be51069..ceee986 100644
--- a/src/commit2.cpp
+++ b/src/commit2.cpp
@@ -5,7 +5,7 @@
#include <syslog.h>
#include <string.h>
#include <sys/time.h>
-#include <glib-2.0/glib.h>
+#include <glib-object.h> /* g_type_init */
#include "common/common.h"
#include "cli_path_utils.h"
@@ -29,8 +29,6 @@ boolean g_old_print_output = FALSE;
#define g_num_actions 5
-extern "C" void g_type_init();
-
// this uses the vtw_act_type enum
const int ActionOrder[g_num_actions] = {
begin_act,
diff --git a/src/dump_session.c b/src/dump_session.c
index 5a3a73e..040a270 100644
--- a/src/dump_session.c
+++ b/src/dump_session.c
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <glib-2.0/glib.h>
+#include <glib-object.h> /* g_type_init */
#include "common/common.h"
boolean g_debug = FALSE;
diff --git a/src/exe_action.c b/src/exe_action.c
index 752a1d9..6aa3fe4 100644
--- a/src/exe_action.c
+++ b/src/exe_action.c
@@ -4,7 +4,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <glib-2.0/glib.h>
+#include <glib-object.h> /* g_type_init */
#include "common/common.h"
boolean g_debug = FALSE;
diff --git a/src/priority.c b/src/priority.c
index cb40b9a..72209b6 100644
--- a/src/priority.c
+++ b/src/priority.c
@@ -5,7 +5,7 @@
#include <dirent.h>
#include <sys/time.h>
#include <string.h>
-
+#include <glib-object.h> /* g_type_init */
void recurse(char *cur_dir,FILE *out);