diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-03-14 18:02:37 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-03-14 18:02:37 +0000 |
| commit | d261f3fbfc37faef46c97cc1d41236a0e92ed9fb (patch) | |
| tree | caaecd5b5127e10cf9e6b7f5920725d034b63001 | |
| parent | df592b6e531baa1b1e99618983c4ddaf0e0c7e21 (diff) | |
| download | glib-d261f3fbfc37faef46c97cc1d41236a0e92ed9fb.tar.gz | |
if _POLL_EMUL_H is defined, undefine HAVE_POLL to prefer our own poll()
Sun Mar 14 12:58:30 2004 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c: if _POLL_EMUL_H is defined, undefine
HAVE_POLL to prefer our own poll() emulation to the
lame OS/X one. (#136956, Manish Singh)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | glib/gmain.c | 8 |
7 files changed, 44 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Sun Mar 14 12:58:30 2004 Owen Taylor <otaylor@redhat.com> + + * glib/gmain.c: if _POLL_EMUL_H is defined, undefine + HAVE_POLL to prefer our own poll() emulation to the + lame OS/X one. (#136956, Manish Singh) + Sat Mar 13 23:30:53 2004 Owen Taylor <otaylor@redhat.com> * glib/gmacros.h (G_STMT_START): Add __extension__ diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 25c684a0d..c13000dad 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sun Mar 14 12:58:30 2004 Owen Taylor <otaylor@redhat.com> + + * glib/gmain.c: if _POLL_EMUL_H is defined, undefine + HAVE_POLL to prefer our own poll() emulation to the + lame OS/X one. (#136956, Manish Singh) + Sat Mar 13 23:30:53 2004 Owen Taylor <otaylor@redhat.com> * glib/gmacros.h (G_STMT_START): Add __extension__ diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 25c684a0d..c13000dad 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Sun Mar 14 12:58:30 2004 Owen Taylor <otaylor@redhat.com> + + * glib/gmain.c: if _POLL_EMUL_H is defined, undefine + HAVE_POLL to prefer our own poll() emulation to the + lame OS/X one. (#136956, Manish Singh) + Sat Mar 13 23:30:53 2004 Owen Taylor <otaylor@redhat.com> * glib/gmacros.h (G_STMT_START): Add __extension__ diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 25c684a0d..c13000dad 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sun Mar 14 12:58:30 2004 Owen Taylor <otaylor@redhat.com> + + * glib/gmain.c: if _POLL_EMUL_H is defined, undefine + HAVE_POLL to prefer our own poll() emulation to the + lame OS/X one. (#136956, Manish Singh) + Sat Mar 13 23:30:53 2004 Owen Taylor <otaylor@redhat.com> * glib/gmacros.h (G_STMT_START): Add __extension__ diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 25c684a0d..c13000dad 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sun Mar 14 12:58:30 2004 Owen Taylor <otaylor@redhat.com> + + * glib/gmain.c: if _POLL_EMUL_H is defined, undefine + HAVE_POLL to prefer our own poll() emulation to the + lame OS/X one. (#136956, Manish Singh) + Sat Mar 13 23:30:53 2004 Owen Taylor <otaylor@redhat.com> * glib/gmacros.h (G_STMT_START): Add __extension__ diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 25c684a0d..c13000dad 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sun Mar 14 12:58:30 2004 Owen Taylor <otaylor@redhat.com> + + * glib/gmain.c: if _POLL_EMUL_H is defined, undefine + HAVE_POLL to prefer our own poll() emulation to the + lame OS/X one. (#136956, Manish Singh) + Sat Mar 13 23:30:53 2004 Owen Taylor <otaylor@redhat.com> * glib/gmacros.h (G_STMT_START): Add __extension__ diff --git a/glib/gmain.c b/glib/gmain.c index f40eea296..81b7d483b 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -48,6 +48,14 @@ # include <sys/poll.h> # undef events /* AIX 4.1.5 & 4.3.2 define this for SVR3,4 compatibility */ # undef revents /* AIX 4.1.5 & 4.3.2 define this for SVR3,4 compatibility */ + +/* The poll() emulation on OS/X doesn't handle fds=NULL, nfds=0, + * so we prefer our own poll emulation. + */ +#ifdef _POLL_EMUL_H_ +#undef HAVE_POLL +#endif + #endif /* GLIB_HAVE_SYS_POLL_H */ #ifdef HAVE_UNISTD_H #include <unistd.h> |