[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r10664: look for the the poll.h and
From: |
rob |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r10664: look for the the poll.h and epoll.h headers, as some platforms implement this entirely in a header file, so looking for the function in the library fails. |
Date: |
Thu, 05 Mar 2009 12:35:09 -0700 |
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 10664
committer: address@hidden
branch nick: trunk
timestamp: Thu 2009-03-05 12:35:09 -0700
message:
look for the the poll.h and epoll.h headers, as some platforms implement this
entirely in a header file, so looking for the function in the library fails.
modified:
cygnal/acinclude.m4
libnet/http.h
libnet/network.cpp
libnet/network.h
=== modified file 'cygnal/acinclude.m4'
--- a/cygnal/acinclude.m4 2009-02-25 22:33:03 +0000
+++ b/cygnal/acinclude.m4 2009-03-05 19:35:09 +0000
@@ -43,7 +43,9 @@
dnl For Asynchronous I/O
dnl AC_CHECK_HEADERS(aio.h poll.h)
+AC_CHECK_HEADERS(poll.h epoll.h)
+
dnl Look for the various ways of blocking while waiting for I/O
-AC_CHECK_FUNCS(pselect poll ppoll epoll)
+AC_CHECK_FUNCS(pselect ppoll)
])
=== modified file 'libnet/http.h'
--- a/libnet/http.h 2009-02-27 16:59:46 +0000
+++ b/libnet/http.h 2009-03-05 19:35:09 +0000
@@ -38,7 +38,7 @@
namespace gnash
{
-class HTTP : public gnash::Network
+class DSOEXPORT HTTP : public gnash::Network
{
public:
// as defined by the W3: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
=== modified file 'libnet/network.cpp'
--- a/libnet/network.cpp 2009-02-25 22:33:03 +0000
+++ b/libnet/network.cpp 2009-03-05 19:35:09 +0000
@@ -51,10 +51,10 @@
# include <sys/param.h>
# include <sys/select.h>
#include <signal.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#else
-# ifdef HAVE_EPOLL
+# ifdef HAVE_EPOLL_H
# include <epoll.h>
# endif
#endif
=== modified file 'libnet/network.h'
--- a/libnet/network.h 2009-02-25 22:33:03 +0000
+++ b/libnet/network.h 2009-03-05 19:35:09 +0000
@@ -28,10 +28,10 @@
# include <netinet/in.h>
# include <arpa/inet.h>
# include <sys/select.h>
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
# include <poll.h>
#else
-# ifdef HAVE_EPOLL
+# ifdef HAVE_EPOLL_H
# include <epoll.h>
# endif
#endif
@@ -191,7 +191,7 @@
/// @param limit The max number of file descriptors to wait for.
///
/// @return A vector of the file descriptors that have activity.
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
boost::shared_ptr<std::vector<struct pollfd> > waitForNetData(int limit,
struct pollfd *fds);
#endif
fd_set waitForNetData(int limit, fd_set data);
@@ -271,7 +271,7 @@
/// \var Handler::_handlers
/// Keep a list of all active network connections
std::map<int, entry_t *> _handlers;
-#ifdef HAVE_POLL
+#ifdef HAVE_POLL_H
std::vector<struct pollfd> _pollfds;
// This is the mutex that controls access to the que.
boost::mutex _poll_mutex;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r10664: look for the the poll.h and epoll.h headers, as some platforms implement this entirely in a header file, so looking for the function in the library fails.,
rob <=