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 679e48b24b8c40022f191e3e03ed95d8d4bea8ad..c693c8bf5726788eecd3f9a47fa54b922f481507 100644 (file)
--- 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 94e00fa7152ff2b89323eff0caf9fef32fa6c417..978097d0536c1a0480bba8e9c5818240919610e5 100644 (file)
--- 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