From: Matthias Andree <matthias.andree@gmx.de>
Date: Thu, 13 Jan 2005 03:15:45 +0000 (+0100)
Subject: lib/blkid/getsize.c: Move #include "blkidP.h" before <sys/queues.h>
X-Git-Tag: E2FSPROGS-1_36~60
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=f892826b8d25369ea513dd8d1c7e714f23dabf99;p=tools%2Fe2fsprogs.git

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.
---

diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog
index 679e48b..c693c8b 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 94e00fa..978097d 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