diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-03-27 21:24:48 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-03-27 21:24:48 +0000 |
| commit | cefa0eb9d9d32a90678253d7a22887ef65a2c535 (patch) | |
| tree | c156428706dcf5622b290add2de16a2b297e251e | |
| parent | 0e23606cf9bf8141f24fed9158dd36e6ba8e20ac (diff) | |
merge r2081 from trunk
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2144 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | src/pulse/context.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pulse/context.c b/src/pulse/context.c index bc960e21..7243a29d 100644 --- a/src/pulse/context.c +++ b/src/pulse/context.c @@ -50,12 +50,12 @@ #include <netdb.h> #endif -#include "../pulsecore/winsock.h" - -#include <pulsecore/core-error.h> #include <pulse/version.h> #include <pulse/xmalloc.h> +#include <pulsecore/winsock.h> +#include <pulsecore/core-error.h> + #include <pulsecore/native-common.h> #include <pulsecore/pdispatch.h> #include <pulsecore/pstream.h> |