--- libretroshare/src/util/stacktrace.h.orig
+++ libretroshare/src/util/stacktrace.h
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 
-#if !defined(WINDOWS_SYS) && !defined(__ANDROID__)
+#if defined(__linux__) && defined(__GLIBC__)
 
 #include <stdlib.h>
 #include <execinfo.h>
@@ -110,13 +110,13 @@ static inline void print_stacktrace(FILE *out = stderr, unsigned int max_frames
 	free(symbollist);
 }
 
-#else // !defined(WINDOWS_SYS) && !defined(__ANDROID__)
+#else // defined(__linux__) && defined(__GLIBC__)
 static inline void print_stacktrace(FILE *out = stderr, unsigned int max_frames = 63)
 {
 	(void) max_frames;
 
 	fprintf(out, "TODO: 2016/01/01 print_stacktrace not implemented yet for WINDOWS_SYS and ANDROID\n");
 }
-#endif // !defined(WINDOWS_SYS) && !defined(__ANDROID__)
+#endif // defined(__linux__) && defined(__GLIBC__)
 
 #endif // _STACKTRACE_H_
--- libretroshare/src/util/rsdir.cc.orig	2017-05-21 00:02:56.024215330 +0200
+++ libretroshare/src/util/rsdir.cc	2017-05-21 00:05:01.129867612 +0200
@@ -57,6 +57,10 @@
 #include <errno.h>
 #endif
 
+#ifndef __GLIBC__
+#define canonicalize_file_name(p) realpath(p, NULL)
+#endif
+
 /****
  * #define RSDIR_DEBUG 1
  ****/