[Xsb-commits] CVS: XSB/packages/xasp xasppkg.H, 1.3, 1.4 xasppkg.c, 1.5, 1.6

[David S. W. <dw...@us...>]

Update of /cvsroot/xsb/XSB/packages/xasp
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24173

Modified Files:
	xasppkg.H xasppkg.c 
Log Message:
Some minor changes to make it closer to compiling in cygwin (and elsewhere)
Elminated a couple of inconsistencies.  Could still take more work.


Index: xasppkg.H
===================================================================
RCS file: /cvsroot/xsb/XSB/packages/xasp/xasppkg.H,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xasppkg.H	27 Sep 2007 17:43:35 -0000	1.3
+++ xasppkg.H	28 Feb 2008 19:55:58 -0000	1.4
@@ -27,7 +27,7 @@
 	
 :- private_foreign_pred smodelsInit from init(void):void.
 :- private_foreign_pred smodelsNumAtoms(+a) from numberAtoms(a:int):void.
-:- private_foreign_pred smodelsAtomName(+a) from atomName(a:string):void.
+%%:- private_foreign_pred smodelsAtomName(+a) from atomName(a:string):void.
 
 :- private_foreign_pred smodelsBeginBasicRule from beginBasicRule(void):void.
 :- private_foreign_pred smodelsBeginChoiceRule from beginChoiceRule(void):void.

Index: xasppkg.c
===================================================================
RCS file: /cvsroot/xsb/XSB/packages/xasp/xasppkg.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xasppkg.c	12 Oct 2007 20:17:19 -0000	1.5
+++ xasppkg.c	28 Feb 2008 19:55:58 -0000	1.6
@@ -36,6 +36,7 @@
 // These variables should not be global in the MT-engine.
 // They will soon be moved to the th_context structure so that
 // each thread can have its own Smodels instance.
+#define MULTI_THREAD 1
 #ifdef MULTI_THREAD
 #include "context.h"
 #include "xasp.h"
@@ -69,7 +70,7 @@
   totatoms=nAtoms;
 }
 
-/*
+/***
 extern "C" void atomName(CTXTdeclc char *name)
 { 
   Atom ** loc_atoms = atoms;
@@ -77,7 +78,9 @@
   api->set_name(globatoms[loc_curatom],name);
   curatom++;
 }
-*/
+***/
+extern "C" void __assert(const char *a, int b, const char *c) { return; }
+
 
 extern "C" void beginBasicRule(CTXTdecl)
 {