diff options
| author | Guy Harris <guy@alum.mit.edu> | 2008-06-03 23:57:47 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2008-06-03 23:57:47 +0000 |
| commit | caa183b45b2cca38f66b8a28feac55849a77866f (patch) | |
| tree | f9aa6a5d698d4ad1d62aca0e7c35da8d8e679af7 | |
| parent | 60e49f65bc8b47372888fea20f2da31bedc66d12 (diff) | |
| download | wireshark-caa183b45b2cca38f66b8a28feac55849a77866f.tar.gz | |
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
| -rw-r--r-- | epan/dfilter/scanner.l | 12 | ||||
| -rw-r--r-- | epan/ftypes/ftype-integer.c | 12 | ||||
| -rw-r--r-- | epan/range.c | 8 |
3 files changed, 0 insertions, 32 deletions
diff --git a/epan/dfilter/scanner.l b/epan/dfilter/scanner.l index 0855e7f29f..eee2abf2c9 100644 --- a/epan/dfilter/scanner.l +++ b/epan/dfilter/scanner.l @@ -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 diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c index ff48e06ff1..3d84cf7036 100644 --- a/epan/ftypes/ftype-integer.c +++ b/epan/ftypes/ftype-integer.c @@ -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) { diff --git a/epan/range.c b/epan/range.c index a5ede86a4f..16059f6ce5 100644 --- a/epan/range.c +++ b/epan/range.c @@ -42,14 +42,6 @@ #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. */ #define RANGE_HDR_SIZE (sizeof (range_t) - sizeof (range_admin_t)) |