1 diff -urN glib1.2-1.2.10 glib
2 --- glib1.2-1.2.10 glib.h 2005-04-18 23:58:21.000000000 -0400
3 +++ glib/glib.h 2005-04-18 23:58:48.000000000 -0400
5 /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
6 * macros, so we can refer to them as strings unconditionally.
9 +#if defined(__GNUC__) && (__GNUC__ < 4)
10 #define G_GNUC_FUNCTION __FUNCTION__
11 #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
13 --- glib1.2-1.2.10/gmain.c Mon Feb 26 22:00:21 2001
14 +++ glib/gmain.c Sun Aug 24 13:46:51 2003
16 /* SunOS has poll, but doesn't provide a prototype. */
17 # if defined (sun) && !defined (__SVR4)
18 extern gint poll (GPollFD *ufds, guint nfsd, gint timeout);
20 +#include <poll.h> /* The opengroup defines the poll.h header as standard */
22 static GPollFunc poll_func = (GPollFunc) poll;
23 #else /* !HAVE_POLL */