remove soft volume from pa_sink_input_new_info since it should be handled internally...

[pulseaudio] / src / pulsecore / poll.c

diff --git a/src/pulsecore/poll.c b/src/pulsecore/poll.c
index 82af4c057be4ed6746e06d38ab6ba5a397fed044..88ac21e46f1eeb6982abfc848a59031f01f6e579 100644 (file)
--- a/src/pulsecore/poll.c
+++ b/src/pulsecore/poll.c
@@ -1,15 +1,9 @@
-/* $Id$ */
-
-/***
-   Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
-   Copyright (C) 2005, Cendio AB.
-   This file is part of PulseAudio.
-   Based on work for the GNU C Library.
-***/
 
 /***
   This file is part of PulseAudio.
 
+  Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB
+
   PulseAudio 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 of the License,
@@ -26,6 +20,11 @@
   USA.
 ***/
 
+/***
+   Based on work for the GNU C Library.
+   Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
+***/
+
 /* Poll the file descriptors described by the NFDS structures starting at
    FDS.  If TIMEOUT is nonzero and not -1, allow TIMEOUT milliseconds for
    an event to occur; if TIMEOUT is -1, block until an event occurs.
@@ -44,7 +43,7 @@
 
 #include "winsock.h"
 
-#ifndef HAVE_SYS_POLL_H
+#ifndef HAVE_POLL_H
 
 #include <pulsecore/core-util.h>