# HG changeset patch
# User Edouard Tisserant
# Date 1438617718 -7200
# Node ID 8bfe0ac00cdb4d473664fcbf1228a0f6a42eee15
# Parent  2b9fd5086704e4bc90f79d35c25ae0749886488c# Parent  72e9e10644321caf15ce9c755e58120f353e222d
merged

diff -r 72e9e1064432 -r 8bfe0ac00cdb drivers/can_socket/Makefile.in
--- a/drivers/can_socket/Makefile.in	Tue Jul 28 16:36:55 2015 +0200
+++ b/drivers/can_socket/Makefile.in	Mon Aug 03 18:01:58 2015 +0200
@@ -55,7 +55,7 @@
 libcanfestival_$(CAN_DRIVER).so: $(OBJS)
 	$(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
 
-install: libcanfestival_$(CAN_DRIVER).so
+install: $(DRIVER)
 	mkdir -p $(DESTDIR)$(PREFIX)/lib/
 	cp $< $(DESTDIR)$(PREFIX)/lib/
 	
@@ -63,6 +63,6 @@
 	rm -f $(TARGET_SOFILES)
 
 clean:
-	rm -f $(OBJS) libcanfestival_$(CAN_DRIVER).so
+	rm -f $(OBJS) $(DRIVER)
 
 mrproper: clean
diff -r 72e9e1064432 -r 8bfe0ac00cdb objdictgen/gen_cfile.py
--- a/objdictgen/gen_cfile.py	Tue Jul 28 16:36:55 2015 +0200
+++ b/objdictgen/gen_cfile.py	Mon Aug 03 18:01:58 2015 +0200
@@ -91,9 +91,9 @@
 
 def ComputeValue(type, value):
     if type == "visible_string":
-        return "\"%s\""%value, ""
+        return "(UNS8*)\"%s\""%value, ""
     elif type == "domain":
-        return "\"%s\""%''.join(["\\x%2.2x"%ord(char) for char in value]), ""
+        return "(UNS8*)\"%s\""%''.join(["\\x%2.2x"%ord(char) for char in value]), ""
     elif type.startswith("real"):
         return "%f"%value, ""
     else: