diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-08-04 12:11:09 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-08-04 16:13:41 +0000 |
| commit | d21295f9a6da65420254afba0bb8a64cb4155947 (patch) | |
| tree | 2cd253d7b2f07b4cbe1b5624fe058f034a19ff69 /epan/g_int64_hash_routines.h | |
| parent | 47e2849ada67ad9d51845c27d4b10479a6dbccf9 (diff) | |
Bump GLib minimum required version to 2.22.0
Change-Id: I0ab85be8090f234f9ca10914063f97f13c894413
Reviewed-on: https://code.wireshark.org/review/16879
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan/g_int64_hash_routines.h')
| -rw-r--r-- | epan/g_int64_hash_routines.h | 45 |
1 files changed, 0 insertions, 45 deletions
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 <glib.h> - -#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 */ |