Clean up.

1 files changed, 13 insertions, 3 deletions

diff --git a/c/defs.h b/c/defs.h
index ad1001a..db5af3a 100644
--- a/c/defs.h
+++ b/c/defs.h
@@ -1,9 +1,6 @@
 #ifndef DEFS_H
 #define DEFS_H
 
-#include <windows.h>
-#include <commctrl.h>
-
 /* common.c */
 TCHAR *TSZFromSZ(const char *, int);
 int Watched(int);
@@ -18,6 +15,7 @@ HWND LvCreate(HWND, HMENU);
 HWND ElvCreate(HWND);
 LRESULT ElvHandleNotify(LPARAM);
 int ElvItemEpisode(int);
+void ElvRedraw(void);
 void ElvSelectRecent(void);
 void ElvUpdate(void);
 void ElvUpdateName(int, int);
@@ -26,4 +24,16 @@ void ElvUpdateName(int, int);
 HWND DlvCreate(HWND);
 void DlvShowEpisode(int);
 
+#define P(m,p,a,t) if (!PL_call_predicate(NULL, PL_Q_NORMAL, \
+	PL_predicate(p,a,m), t))
+#define Q(m,p,a,t) PL_open_query(NULL, PL_Q_NORMAL, PL_predicate(p,a,m), t)
+#define Qn(q) PL_next_solution(q)
+#define Qc(q) PL_cut_query(q)
+#define F(f) f = PL_open_foreign_frame()
+#define Fd(f) PL_discard_foreign_frame(f)
+#define T(a) PL_new_term_refs(a)
+#define PI(t,x) if (!PL_put_integer(t,x))
+#define GI(t,x) if (!PL_get_integer(t,x))
+#define GAC(t,x) if (!PL_get_atom_chars(t,x))
+
 #endif