drop glibc travis exceptions - we don't use glibc any more

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/bindings.c b/bindings.c
index 30fe31e96e985bdeb0a74bc8aa3a54fbd6099b96..4bb0631d0b884ef25d7f9abb9595baca4a63a9db 100644 (file)
--- a/bindings.c
+++ b/bindings.c
@@ -28,11 +28,6 @@
 #include <sys/epoll.h>
 #include <wait.h>
 
-#ifdef FORTRAVIS
-#define GLIB_DISABLE_DEPRECATION_WARNINGS
-#include <glib-object.h>
-#endif
-
 #include "bindings.h"
 
 #include "config.h" // for VERSION

diff --git a/lxcfs.c b/lxcfs.c
index 6e87c4c93471a6e093a3877ba6cb36ededefb0bf..1d1016c36e7314de663ef31ae1d0f90c9740bc93 100644 (file)
--- a/lxcfs.c
+++ b/lxcfs.c
@@ -28,11 +28,6 @@
 #include <sys/epoll.h>
 #include <wait.h>
 
-#ifdef FORTRAVIS
-#define GLIB_DISABLE_DEPRECATION_WARNINGS
-#include <glib-object.h>
-#endif
-
 #include "config.h" // for VERSION
 #include "bindings.h"
 
@@ -888,12 +883,6 @@ int main(int argc, char *argv[])
        int nargs = 5, cnt = 0;
        char *newargv[6];
 
-#ifdef FORTRAVIS
-       /* for travis which runs on 12.04 */
-       if (glib_check_version (2, 36, 0) != NULL)
-               g_type_init ();
-#endif
-
        /* accomodate older init scripts */
        swallow_arg(&argc, argv, "-s");
        swallow_arg(&argc, argv, "-f");