Add Plp, Plg functions.

1 files changed, 3 insertions, 12 deletions

diff --git a/c/defs.h b/c/defs.h
index 2b4e0ba..8196a93 100644
--- a/c/defs.h
+++ b/c/defs.h
@@ -3,6 +3,7 @@
 
 #include <windows.h>
 #include <commctrl.h>
+#include <SWI-Prolog.h>
 
 /* common.c */
 TCHAR *TszFromSz(const char *, int);
@@ -32,6 +33,8 @@ void DlvShowEpisode(int);
 
 /* pl.c */
 int Pl(char *, char *, char *, ...);
+int Plp(term_t, char *, ...);
+int Plg(term_t, char *, ...);
 
 /* defs.h */
 #define DLVSIKEY 0
@@ -40,18 +43,6 @@ int Pl(char *, char *, char *, ...);
 #define ELVSITITLE 1
 #define ELVSIRATING 2
 
-#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 T(a) PL_new_term_refs(a)
-#define A(s) PL_new_atom(s)
-#define PA(t,x) if (!PL_put_atom(t,x))
-#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))
-
 inline int
 Cmp(int a, int b)
 {