summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortklauser@access.unizh.ch <tklauser@access.unizh.ch>2005-03-11 02:31:58 +0100
committerGreg KH <gregkh@suse.de>2005-04-26 23:53:17 -0700
commit9066c16adaf90888bc2ffe1a816f3638d58e0bdb (patch)
treef419316406fbee5d417e9538277ad73c46f51055
parente296b1476e99150413d92c58e3b5e07e5bda9fd4 (diff)
[PATCH] The following patch fixes some warnings when compiling volume_id
-rw-r--r--extras/volume_id/Makefile2
-rw-r--r--extras/volume_id/udev_volume_id.c4
-rw-r--r--extras/volume_id/volume_id/logging.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 9c274212a6..efec58f80e 100644
--- 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 54d95270d0..a00b01a27d 100644
--- 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 c81dc57567..ac30264158 100644
--- 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_ */