summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Verfaillie <dieterv@optionexplicit.be>2013-09-20 17:51:29 +0200
committerColin Walters <walters@verbum.org>2013-10-09 12:48:46 -0400
commit9c5c43c01ef4e2f81c4bedb9da613fd5a1dccd82 (patch)
tree1262c523e3b98a487689946a5739afc2a443914f
parentaddaba8043ef4edf70ebb84fc19a0c2d70a3085e (diff)
downloadgobject-introspection-9c5c43c01ef4e2f81c4bedb9da613fd5a1dccd82.tar.gz
girepository: remove glib-compat
We depend on glib-2.0 >= 2.36.0, so no need to keep a 2.22.X compatibility symbol around...
-rw-r--r--Makefile-girepository.am1
-rw-r--r--docs/reference/Makefile.am1
-rw-r--r--girepository/girepository.c1
-rw-r--r--girepository/gitypelib.c1
-rw-r--r--girepository/glib-compat.h25
5 files changed, 0 insertions, 29 deletions
diff --git a/Makefile-girepository.am b/Makefile-girepository.am
index 11549d44..04ec549c 100644
--- a/Makefile-girepository.am
+++ b/Makefile-girepository.am
@@ -66,7 +66,6 @@ libgirepository_1_0_la_SOURCES = \
girepository/gitypeinfo.c \
girepository/gitypelib.c \
girepository/gitypelib-internal.h \
- girepository/glib-compat.h \
girepository/giunioninfo.c \
girepository/givfuncinfo.c
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 65892027..937ac808 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -21,7 +21,6 @@ CFILE_GLOB=$(top_srcdir)/girepository/*.c
# Headers to ignore
IGNORE_HFILES= \
- glib-compat.h \
girnode.h \
ginfo.h \
girparser.h \
diff --git a/girepository/girepository.c b/girepository/girepository.c
index 0922fb09..93c23728 100644
--- a/girepository/girepository.c
+++ b/girepository/girepository.c
@@ -31,7 +31,6 @@
#include "girepository.h"
#include "gitypelib-internal.h"
#include "girepository-private.h"
-#include "glib-compat.h"
#include "config.h"
diff --git a/girepository/gitypelib.c b/girepository/gitypelib.c
index d88924a6..1436caf1 100644
--- a/girepository/gitypelib.c
+++ b/girepository/gitypelib.c
@@ -27,7 +27,6 @@
#include "config.h"
#include "gitypelib-internal.h"
-#include "glib-compat.h"
typedef struct {
GITypelib *typelib;
diff --git a/girepository/glib-compat.h b/girepository/glib-compat.h
deleted file mode 100644
index 2518092c..00000000
--- a/girepository/glib-compat.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- * GObject introspection: Compatibility definitions
- *
- * Copyright (C) 2009 Javier Jardón
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#if !GLIB_CHECK_VERSION(2,22,0)
-#define g_mapped_file_unref(x) g_mapped_file_free(x)
-#endif