From d21295f9a6da65420254afba0bb8a64cb4155947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Thu, 4 Aug 2016 12:11:09 +0100 Subject: Bump GLib minimum required version to 2.22.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0ab85be8090f234f9ca10914063f97f13c894413 Reviewed-on: https://code.wireshark.org/review/16879 Petri-Dish: João Valverde Reviewed-by: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde --- epan/g_int64_hash_routines.h | 45 -------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 epan/g_int64_hash_routines.h (limited to 'epan/g_int64_hash_routines.h') diff --git a/epan/g_int64_hash_routines.h b/epan/g_int64_hash_routines.h deleted file mode 100644 index 9388f56a1d..0000000000 --- a/epan/g_int64_hash_routines.h +++ /dev/null @@ -1,45 +0,0 @@ -/* g_int64_hash_routines.h - * Declaration of gint64 hash table routines absent from GLib < 2.22 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef __G_INT64_HASH_ROUTINES_H__ -#define __G_INT64_HASH_ROUTINES_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include - -#include "ws_symbol_export.h" - -/* g_int64_hash, g_int64_equal are defined starting glib 2.22 - otherwise, - we have to provide them ourselves */ -#if !GLIB_CHECK_VERSION(2,22,0) -WS_DLL_PUBLIC guint -g_int64_hash (gconstpointer v); - -WS_DLL_PUBLIC gboolean -g_int64_equal (gconstpointer v1, - gconstpointer v2); -#endif /* !GLIB_CHECK_VERSION(2,22,0) */ - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* g_int64_hash_routines.h */ -- cgit v1.2.3