puzzles: refactor and resync with upstream

This brings puzzles up-to-date with upstream revision
2d333750272c3967cfd5cd3677572cddeaad5932, though certain changes made
by me, including cursor-only Untangle and some compilation fixes
remain. Upstream code has been moved to its separate subdirectory and
future syncs can be done by simply copying over the new sources.

Change-Id: Ia6506ca5f78c3627165ea6791d38db414ace0804

1 files changed, 12 insertions, 0 deletions

diff --git a/apps/plugins/puzzles/rbcompat.h b/apps/plugins/puzzles/rbcompat.h
index 148aaef073..4bb9f39ca7 100644
--- a/apps/plugins/puzzles/rbcompat.h
+++ b/apps/plugins/puzzles/rbcompat.h
@@ -1,5 +1,11 @@
+#ifndef __RBCOMPAT_H__
+#define __RBCOMPAT_H__
+
 #include "plugin.h"
 #include "rbassert.h"
+#include "lib/pluginlib_exit.h"
+
+#include <tlsf.h>
 
 int sprintf_wrapper(char *str, const char *fmt, ...);
 char *getenv_wrapper(const char *c);
@@ -60,3 +66,9 @@ double acos_wrapper(double x);
 #define strtoq strtoq_wrapper
 #define strtouq strtouq_wrapper
 #define vsprintf vsprintf_wrapper
+
+#define abs(x) ((x)<0?-(x):(x))
+
+/* work around compilation error */
+typedef void FILE;
+#endif