forked from osmocom/wireshark
We require GLib 2.4 or later, and they define G_MININT32, G_MAXIN32,
G_MAXUINT32, and G_MAXUINT64; don't check whether we need to define them ourselves. svn path=/trunk/; revision=25420
This commit is contained in:
parent
60e49f65bc
commit
caa183b45b
|
@ -57,18 +57,6 @@
|
|||
#pragma warning (disable:4018)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* GLib 1.2[.x] doesn't define G_MAXINT32 or G_MININT32; if they're not
|
||||
* defined, we define them as the maximum and minimum 32-bit signed
|
||||
* 2's-complement number.
|
||||
*/
|
||||
#ifndef G_MAXINT32
|
||||
#define G_MAXINT32 ((gint32)0x7FFFFFFF)
|
||||
#endif
|
||||
#ifndef G_MININT32
|
||||
#define G_MININT32 ((gint32)0x80000000)
|
||||
#endif
|
||||
|
||||
#define LVAL df_lval
|
||||
#define LVAL_TYPE stnode_t*
|
||||
#define LVAL_INIT_VAL NULL
|
||||
|
|
|
@ -33,18 +33,6 @@
|
|||
#include "g_ascii_strtoull.h"
|
||||
#endif
|
||||
|
||||
/*
|
||||
* GLib 1.2[.x] doesn't define G_MAXUINT32 or G_MAXUINT64; if they're
|
||||
* not defined, we define them as the maximum 32-bit and 64-bit
|
||||
* unsigned numbers.
|
||||
*/
|
||||
#ifndef G_MAXUINT32
|
||||
#define G_MAXUINT32 ((guint32)0xFFFFFFFFU)
|
||||
#endif
|
||||
#ifndef G_MAXUINT64
|
||||
#define G_MAXUINT64 ((guint64)G_GINT64_CONSTANT(0xFFFFFFFFFFFFFFFFU))
|
||||
#endif
|
||||
|
||||
static void
|
||||
int_fvalue_new(fvalue_t *fv)
|
||||
{
|
||||
|
|
|
@ -41,14 +41,6 @@
|
|||
#include <epan/emem.h>
|
||||
#include <stdio.h>
|
||||
|
||||
/*
|
||||
* GLib 1.2[.x] doesn't define G_MAXUINT32; if it's not defined, we define
|
||||
* it as the maximum 32-bit unsigned number.
|
||||
*/
|
||||
#ifndef G_MAXUINT32
|
||||
#define G_MAXUINT32 ((guint32)0xFFFFFFFFU)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Size of the header of a range_t.
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue