diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-08-18 18:41:25 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-08-18 18:41:25 +0000 |
| commit | 8649fcf232030bc3a4ad1c3eaf9e63c62085fbab (patch) | |
| tree | 5bf4909fb9ce4c5e3ceacc9d869ab2a623c0a908 | |
| parent | 718b853b532297bbc3e7d1cf893aa7d183f7e083 (diff) | |
From Gisle Vanem: MingW declares "rint()" in <math.h> and defines it in
a library, and declares "mode_t" in <sys/types.h>.
svn path=/trunk/; revision=8185
| -rw-r--r-- | gtk/tcp_graph.c | 6 | ||||
| -rw-r--r-- | util.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index df9396411f..7ad8bf668c 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -3,7 +3,7 @@ * By Pavel Mores <pvl@uh.cz> * Win32 port: rwh@unifiedtech.com * - * $Id: tcp_graph.c,v 1.32 2003/03/02 22:31:25 guy Exp $ + * $Id: tcp_graph.c,v 1.33 2003/08/18 18:41:25 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -504,7 +504,7 @@ static void rtt_put_unack_on_list (struct unack ** , struct unack * ); static void rtt_delete_unack_from_list (struct unack ** , struct unack * ); static void rtt_make_elmtlist (struct graph * ); static void rtt_toggle_seq_origin (struct graph * ); -#ifdef WIN32 +#if defined(WIN32) && !defined(__MINGW32__) static int rint (double ); /* compiler template for Windows */ #endif @@ -3915,7 +3915,7 @@ static void rtt_toggle_seq_origin (struct graph *g) g->x_axis->min = 0; } -#ifdef WIN32 +#if defined(WIN32) && !defined(__MINGW32__) /* replacement of Unix rint() for Windows */ static int rint (double x) { @@ -1,7 +1,7 @@ /* util.c * Utility routines * - * $Id: util.c,v 1.67 2003/07/11 06:45:59 guy Exp $ + * $Id: util.c,v 1.68 2003/08/18 18:41:24 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -51,8 +51,10 @@ #ifdef HAVE_IO_H #include <io.h> +#ifndef __MINGW32__ typedef int mode_t; /* for win32 */ -#endif +#endif /* __MINGW32__ */ +#endif /* HAVE_IO_H */ #ifdef HAVE_LIBZ #include <zlib.h> /* to get the libz version number */ |