merge 'lennart' branch back into trunk.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-10-28 19:13:50 +00:00
parent 6687dd0131
commit a67c21f093
294 changed files with 79057 additions and 11614 deletions

View file

@ -26,7 +26,9 @@
#include <sys/types.h>
/* config.h must be included before this file */
#ifndef PACKAGE
#error "Please include config.h before including this file!"
#endif
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>