From 187c191219196912a2132dcb96059ed4be0acea4 Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Wed, 26 May 1999 12:12:21 +0000 Subject: [PATCH] provide a poll() prototype for SunOS, as it doesn't provide one itself. 1999-05-26 Sebastian Wilhelmi * gmain.c: provide a poll() prototype for SunOS, as it doesn't provide one itself. Reported by Christian Parg . --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gmain.c | 4 ++++ gmain.c | 4 ++++ 10 files changed, 48 insertions(+) diff --git a/ChangeLog b/ChangeLog index ea150f0b5..4364d6ad1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-05-26 Sebastian Wilhelmi + + * gmain.c: provide a poll prototype for SunOS, as they do not do + it self. Hint from Christian Parg . + Tue May 25 12:23:07 1999 Owen Taylor * gstrfuncs.c (g_strchug): Use g_memmove() not memmove(). diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ea150f0b5..4364d6ad1 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +1999-05-26 Sebastian Wilhelmi + + * gmain.c: provide a poll prototype for SunOS, as they do not do + it self. Hint from Christian Parg . + Tue May 25 12:23:07 1999 Owen Taylor * gstrfuncs.c (g_strchug): Use g_memmove() not memmove(). diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ea150f0b5..4364d6ad1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +1999-05-26 Sebastian Wilhelmi + + * gmain.c: provide a poll prototype for SunOS, as they do not do + it self. Hint from Christian Parg . + Tue May 25 12:23:07 1999 Owen Taylor * gstrfuncs.c (g_strchug): Use g_memmove() not memmove(). diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index ea150f0b5..4364d6ad1 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +1999-05-26 Sebastian Wilhelmi + + * gmain.c: provide a poll prototype for SunOS, as they do not do + it self. Hint from Christian Parg . + Tue May 25 12:23:07 1999 Owen Taylor * gstrfuncs.c (g_strchug): Use g_memmove() not memmove(). diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ea150f0b5..4364d6ad1 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +1999-05-26 Sebastian Wilhelmi + + * gmain.c: provide a poll prototype for SunOS, as they do not do + it self. Hint from Christian Parg . + Tue May 25 12:23:07 1999 Owen Taylor * gstrfuncs.c (g_strchug): Use g_memmove() not memmove(). diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ea150f0b5..4364d6ad1 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +1999-05-26 Sebastian Wilhelmi + + * gmain.c: provide a poll prototype for SunOS, as they do not do + it self. Hint from Christian Parg . + Tue May 25 12:23:07 1999 Owen Taylor * gstrfuncs.c (g_strchug): Use g_memmove() not memmove(). diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ea150f0b5..4364d6ad1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +1999-05-26 Sebastian Wilhelmi + + * gmain.c: provide a poll prototype for SunOS, as they do not do + it self. Hint from Christian Parg . + Tue May 25 12:23:07 1999 Owen Taylor * gstrfuncs.c (g_strchug): Use g_memmove() not memmove(). diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ea150f0b5..4364d6ad1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +1999-05-26 Sebastian Wilhelmi + + * gmain.c: provide a poll prototype for SunOS, as they do not do + it self. Hint from Christian Parg . + Tue May 25 12:23:07 1999 Owen Taylor * gstrfuncs.c (g_strchug): Use g_memmove() not memmove(). diff --git a/glib/gmain.c b/glib/gmain.c index 991bf1264..94740a3c6 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -184,6 +184,10 @@ static gboolean poll_changed = FALSE; #endif /* G_THREADS_ENABLED */ #ifdef HAVE_POLL +/* SunOS has poll, but doesn't provide a prototype. */ +# if defined (sun) && !defined (__SVR4) +extern gint poll (GPollFD *ufds, guint nfsd, gint timeout); +# endif /* !sun */ static GPollFunc poll_func = (GPollFunc) poll; #else /* !HAVE_POLL */ #ifdef NATIVE_WIN32 diff --git a/gmain.c b/gmain.c index 991bf1264..94740a3c6 100644 --- a/gmain.c +++ b/gmain.c @@ -184,6 +184,10 @@ static gboolean poll_changed = FALSE; #endif /* G_THREADS_ENABLED */ #ifdef HAVE_POLL +/* SunOS has poll, but doesn't provide a prototype. */ +# if defined (sun) && !defined (__SVR4) +extern gint poll (GPollFD *ufds, guint nfsd, gint timeout); +# endif /* !sun */ static GPollFunc poll_func = (GPollFunc) poll; #else /* !HAVE_POLL */ #ifdef NATIVE_WIN32