Merge commit 'elmarco/bluetooth-fixes'

[pulseaudio] / src / pulsecore / poll.h

diff --git a/src/pulsecore/poll.h b/src/pulsecore/poll.h
index 9c29789d5067d631a84079f86aa4b754ea4da30e..fe0c6af65083a385217c5df06f2d27633fea86ac 100644 (file)
--- a/src/pulsecore/poll.h
+++ b/src/pulsecore/poll.h
@@ -1,19 +1,11 @@
-/* $Id$ */
-
-/***
-   Compatibility definitions for System V `poll' interface.
-   Copyright (C) 1994,96,97,98,99,2000,2001,2004 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,
+  by the Free Software Foundation; either version 2.1 of the License,
   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but
@@ -27,6 +19,11 @@
   USA.
 ***/
 
+/***
+   Based on work for the GNU C Library.
+   Copyright (C) 1994,96,97,98,99,2000,2001,2004 Free Software Foundation, Inc.
+***/
+
 /* Event types that can be polled for.  These bits may be set in `events'
    to indicate the interesting event types; they will appear in `revents'
    to indicate the status of the file descriptor.  */