From 045c1d602dcba57868845ba3270510593c39480f Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 15 May 2008 23:34:41 +0000
Subject: merge glitch-free branch back into trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2445 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/pulsecore/flist.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/pulsecore/flist.h')

diff --git a/src/pulsecore/flist.h b/src/pulsecore/flist.h
index daf0fec4..3d9a89a2 100644
--- a/src/pulsecore/flist.h
+++ b/src/pulsecore/flist.h
@@ -25,9 +25,9 @@
 ***/
 
 #include <pulse/def.h>
+#include <pulse/gccmacro.h>
 
 #include <pulsecore/once.h>
-#include <pulsecore/gccmacro.h>
 
 /* A multiple-reader multipler-write lock-free free list implementation */
 
-- 
cgit