diff options
| author | Kim Hagen <kim.sidney@gmail.com> | 2017-11-01 13:33:26 +0100 |
|---|---|---|
| committer | Kim Hagen <kim.sidney@gmail.com> | 2017-11-01 13:33:26 +0100 |
| commit | b2654f613913987d685effc430a572927be87430 (patch) | |
| tree | c6199ce65eb65807a1bbee8e2529bca6eb264c39 | |
| parent | 0b2db35f54fb38ac484854d22a8b2f9460c21689 (diff) | |
| download | vyatta-cfg-b2654f613913987d685effc430a572927be87430.tar.gz vyatta-cfg-b2654f613913987d685effc430a572927be87430.zip | |
only do "g_type_init()" if version is 2.35.0
| -rw-r--r-- | src/commit2.cpp | 2 | ||||
| -rw-r--r-- | src/dump_session.c | 2 | ||||
| -rw-r--r-- | src/exe_action.c | 2 | ||||
| -rw-r--r-- | src/priority.c | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/src/commit2.cpp b/src/commit2.cpp index ceee986..4594d08 100644 --- a/src/commit2.cpp +++ b/src/commit2.cpp @@ -159,7 +159,9 @@ main(int argc, char** argv) char *commit_comment = NULL; /* this is needed before calling certain glib functions */ + #if !GLIB_CHECK_VERSION(2,35,0) g_type_init(); + #endif //grab inputs while ((ch = getopt(argc, argv, "xdpthsecoafb:rlC:")) != -1) { diff --git a/src/dump_session.c b/src/dump_session.c index 040a270..f4bea4b 100644 --- a/src/dump_session.c +++ b/src/dump_session.c @@ -47,7 +47,9 @@ main(int argc, char** argv) int ch; /* this is needed before calling certain glib functions */ + #if !GLIB_CHECK_VERSION(2,35,0) g_type_init(); + #endif //grab inputs while ((ch = getopt(argc, argv, "dvh")) != -1) { diff --git a/src/exe_action.c b/src/exe_action.c index 6aa3fe4..87aee26 100644 --- a/src/exe_action.c +++ b/src/exe_action.c @@ -35,7 +35,9 @@ main(int argc, char** argv) unsigned long act = 0; /* this is needed before calling certain glib functions */ + #if !GLIB_CHECK_VERSION(2,35,0) g_type_init(); + #endif //grab inputs while ((ch = getopt(argc, argv, "dhp:a:")) != -1) { diff --git a/src/priority.c b/src/priority.c index 72209b6..5f12610 100644 --- a/src/priority.c +++ b/src/priority.c @@ -33,7 +33,9 @@ main(int argc, char** argv) char *filename = NULL; /* this is needed before calling certain glib functions */ + #if !GLIB_CHECK_VERSION(2,35,0) g_type_init(); + #endif //grab inputs while ((ch = getopt(argc, argv, "hf:")) != -1) { |