=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/miscf.c,v retrieving revision 1.28 retrieving revision 1.33 diff -u -p -r1.28 -r1.33 --- OpenXM_contrib2/asir2000/builtin/miscf.c 2010/12/25 23:10:15 1.28 +++ OpenXM_contrib2/asir2000/builtin/miscf.c 2015/03/16 00:08:32 1.33 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/builtin/miscf.c,v 1.27 2008/08/26 16:17:03 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/miscf.c,v 1.32 2013/11/05 02:55:03 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -83,6 +83,7 @@ void Pmodule_definedp(); void Ptest(); void delete_history(int,int); +void grab_pointer(); struct ftab misc_tab[] = { {"pwd",Pgetcwd,0}, @@ -276,7 +277,7 @@ NODE arg; STRING *rp; { char *e,*f; - int len; + size_t len; e = (char *)getenv(BDY((STRING)ARG0(arg))); if ( e ) { @@ -355,7 +356,9 @@ void Pheap(arg,rp) NODE arg; Q *rp; { - int h0,h; + size_t h0,h; + unsigned int u,l; + N n; void GC_expand_hp(int); h0 = get_heapsize(); @@ -365,7 +368,16 @@ Q *rp; GC_expand_hp(h-h0); } h = get_heapsize(); - STOQ(h,*rp); + if(sizeof(size_t)>sizeof(int)) { + u = h>>(sizeof(int)*CHAR_BIT); l = h&(~0); + if ( !u ) UTOQ(l,*rp); + else { + n = NALLOC(2); PL(n)=2; BD(n)[0] = l; BD(n)[1] = u; + NTOQ(n,1,*rp); + } + }else { + UTOQ(h,*rp); + } } unsigned int get_asir_version(); @@ -436,7 +448,7 @@ Q *rp; s = ""; else s = BDY((STRING)ARG0(arg)); - toplevel(s); + goto_toplevel(s); *rp = 0; } @@ -598,7 +610,7 @@ init_display() rootwin = RootWindow(display,DefaultScreen(display)); } -grab_pointer() +void grab_pointer() { XEvent ev; static Cursor cursor;