Merge pull request #63 from tilt12345678/merging

suggested fixes for issues #61, #62
jcnelson · Sep 3, 2015 · 1215679 · 1215679
2 parents 87806ab + daa1ca6
commit 1215679
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/libudev-compat/util.h b/libudev-compat/util.h
@@ -124,6 +124,18 @@ bool streq_ptr(const char *a, const char *b);
 #define ALIGN(l) ALIGN4(l)
 #endif
 
+#ifndef MAX_HANDLE_SZ
+#define MAX_HANDLE_SZ	128
+
+struct file_handle
+{
+  unsigned int handle_bytes;
+  int handle_type;
+  /* File identifier.  */
+  unsigned char f_handle[0];
+};
+#endif
+
 union file_handle_union {
         struct file_handle handle;
         char padding[sizeof(struct file_handle) + MAX_HANDLE_SZ];

diff --git a/vdevd/helpers/LINUX/Makefile b/vdevd/helpers/LINUX/Makefile
@@ -3,7 +3,7 @@ include ../../../buildconf.mk
 C_SRCS:= $(wildcard *.c) 
 CXSRCS:= $(wildcard *.cpp) 
 OBJ   := $(patsubst %.c,$(BUILD_VDEVD_HELPERS)/%.o,$(C_SRCS)) $(patsubst %.cpp,$(BUILD_VDEVD_HELPERS)/%.o,$(CXSRCS))
-LIB   :=
+LIB   := -lrt
 
 HELPER_SCRIPTS := $(wildcard *.sh) daemonlet
 HELPERS := stat_optical stat_ata stat_input stat_scsi stat_v4l stat_net stat_usb stat_bus stat_path event-put echo_n $(HELPER_SCRIPTS)