[PATCH] The following patch fixes some warnings when compiling volume_id

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 9c274212a653a4d757a8071fbc54881114097595..efec58f80efb9286ccffbf4418bdf4a51de594be 100644 (file)
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -28,7 +28,7 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
-override CFLAGS+=-D_FILE_OFFSET_BITS=64
+override CFLAGS+=-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 
 VOLUME_ID_BASE=volume_id
 include $(VOLUME_ID_BASE)/Makefile.inc

diff --git a/extras/volume_id/udev_volume_id.c b/extras/volume_id/udev_volume_id.c
index 54d95270d0bcda7480ff4027fa5a42000951afca..a00b01a27daafd4a113990e09eab449d4d259e17 100644 (file)
--- a/extras/volume_id/udev_volume_id.c
+++ b/extras/volume_id/udev_volume_id.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/extras/volume_id/volume_id/logging.h b/extras/volume_id/volume_id/logging.h
index c81dc5756737817921692b9975f0f9024d151e73..ac302641587b7937e1f3375277d7f562ed71eee1 100644 (file)
--- a/extras/volume_id/volume_id/logging.h
+++ b/extras/volume_id/volume_id/logging.h
@@ -16,6 +16,6 @@
 #endif
 
 /* just use the udev version */
-#include "../../logging.h"
+#include "../../../logging.h"
 
 #endif /* _VOLUME_ID_LOGGING_H_ */