[vlc-commits] Remove the now broken Maemo 5 poll hack

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jan 19 20:21:46 2012 +0200| [62a4f9f3bef9dcae0e197bb307e624205a0a1519] | committer: Rémi Denis-Courmont

Remove the now broken Maemo 5 poll hack

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=62a4f9f3bef9dcae0e197bb307e624205a0a1519
---

 bin/vlc.c            |   14 ---------
 include/vlc_fixups.h |    3 --
 src/Makefile.am      |    3 --
 src/network/poll.c   |   76 --------------------------------------------------
 4 files changed, 0 insertions(+), 96 deletions(-)

diff --git a/bin/vlc.c b/bin/vlc.c
index 4d20f89..2b18719 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -55,13 +55,6 @@ extern void LocaleFree (const char *);
 extern char *FromLocale (const char *);
 extern void vlc_enable_override (void);
 
-#ifdef HAVE_MAEMO
-static void dummy_handler (int signum)
-{
-    (void) signum;
-}
-#endif
-
 static bool signal_ignored (int signum)
 {
     struct sigaction sa;
@@ -177,13 +170,6 @@ int main( int i_argc, const char *ppsz_argv[] )
      * block SIGCHLD in all threads, and dequeue it below. */
     sigaddset (&set, SIGCHLD);
 
-#ifdef HAVE_MAEMO
-    sigaddset (&set, SIGRTMIN);
-    {
-        struct sigaction act = { .sa_handler = dummy_handler, };
-        sigaction (SIGRTMIN, &act, NULL);
-    }
-#endif
     /* Block all these signals */
     pthread_sigmask (SIG_SETMASK, &set, NULL);
 
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 48ccf24..b5884f4 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -276,9 +276,6 @@ struct pollfd
 #endif
 #ifndef HAVE_POLL
 # define poll(a, b, c) vlc_poll(a, b, c)
-#elif defined (HAVE_MAEMO)
-# include <poll.h>
-# define poll(a, b, c) vlc_poll(a, b, c)
 #endif
 
 #ifndef HAVE_IF_NAMEINDEX
diff --git a/src/Makefile.am b/src/Makefile.am
index 7eb362c..ada5b90 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -243,7 +243,6 @@ SOURCES_libvlc_darwin = \
 	misc/atomic.c \
 	posix/filesystem.c \
 	posix/plugin.c \
-	network/poll.c \
 	posix/thread.c \
 	posix/darwin_specific.c \
 	posix/rand.c \
@@ -254,7 +253,6 @@ SOURCES_libvlc_linux = \
 	misc/atomic.c \
 	posix/filesystem.c \
 	posix/plugin.c \
-	network/poll.c \
 	posix/thread.c \
 	posix/linux_specific.c \
 	posix/rand.c \
@@ -294,7 +292,6 @@ SOURCES_libvlc_other = \
 	posix/dirs.c \
 	misc/atomic.c \
 	posix/filesystem.c \
-	network/poll.c \
 	posix/thread.c \
 	posix/plugin.c \
 	posix/specific.c \
diff --git a/src/network/poll.c b/src/network/poll.c
deleted file mode 100644
index da78f7f..0000000
--- a/src/network/poll.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*****************************************************************************
- * poll.c: I/O event multiplexing
- *****************************************************************************
- * Copyright © 2007 Rémi Denis-Courmont
- * $Id$
- *
- * Author: Rémi Denis-Courmont
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_common.h>
-
-#ifdef HAVE_MAEMO
-# include <vlc_network.h>
-# include <signal.h>
-# include <errno.h>
-# include <poll.h>
-
-int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
-{
-    struct timespec tsbuf, *ts;
-    sigset_t set;
-    int canc, ret;
-
-    if (timeout != -1)
-    {
-        div_t d = div (timeout, 1000);
-        tsbuf.tv_sec = d.quot;
-        tsbuf.tv_nsec = d.rem * 1000000;
-        ts = &tsbuf;
-    }
-    else
-        ts = NULL;
-
-    pthread_sigmask (SIG_BLOCK, NULL, &set);
-    sigdelset (&set, SIGRTMIN);
-
-    canc = vlc_savecancel ();
-    ret = ppoll (fds, nfds, ts, &set);
-    vlc_restorecancel (canc);
-
-    vlc_testcancel ();
-    return ret;
-}
-
-#elif defined (HAVE_POLL)
-# include <vlc_network.h>
-
-struct pollfd;
-
-int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
-{
-    (void)fds; (void)nfds; (void)timeout;
-    abort ();
-}
-
-#else
-# error poll() not implemented!
-#endif