From f892826b8d25369ea513dd8d1c7e714f23dabf99 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Thu, 13 Jan 2005 04:15:45 +0100
Subject: [PATCH] lib/blkid/getsize.c: Move #include "blkidP.h" before
 <sys/queues.h> to avoid a clash with the LIST_HEAD in the latter file that
 results in compilation failure.

---
 lib/blkid/ChangeLog | 5 +++++
 lib/blkid/getsize.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog
index 679e48b24..c693c8bf5 100644
--- a/lib/blkid/ChangeLog
+++ b/lib/blkid/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-13  Matthias Andree  <matthias.andree@gmx.de>
+
+	* getsize.c: Move #include "blkidP.h" before <sys/queues.h> to avoid a
+	clash with the LIST_HEAD in the latter file.
+
 2005-01-10  Theodore Ts'o  <tytso@mit.edu>
 
 	* probe.c: Integrate and fix up Janos Farkas's patch.  Version 0
diff --git a/lib/blkid/getsize.c b/lib/blkid/getsize.c
index 94e00fa71..978097d05 100644
--- a/lib/blkid/getsize.c
+++ b/lib/blkid/getsize.c
@@ -12,6 +12,9 @@
 #define _LARGEFILE_SOURCE
 #define _LARGEFILE64_SOURCE
 
+/* include this before sys/queues.h! */
+#include "blkidP.h"
+
 #include <stdio.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
@@ -40,9 +43,6 @@
 #include <sys/utsname.h>
 #endif
 
-#include "blkidP.h"
-
-
 #if defined(__linux__) && defined(_IO) && !defined(BLKGETSIZE)
 #define BLKGETSIZE _IO(0x12,96)	/* return device size */
 #endif
-- 
2.47.3