diff -ruN klic-3.003-2001-12-29/ChangeLog klic-3.003-2001-12-30/ChangeLog --- klic-3.003-2001-12-29/ChangeLog Sat Dec 29 12:46:20 2001 +++ klic-3.003-2001-12-30/ChangeLog Sun Dec 30 17:14:44 2001 @@ -1,3 +1,7 @@ +2001-12-30 TAKAGI Yusuke + + * include/klic/extinl.h: remove. + 2001-12-29 TAKAGI Yusuke * include/klic/basic.h: diff -ruN klic-3.003-2001-12-29/MANIFEST klic-3.003-2001-12-30/MANIFEST --- klic-3.003-2001-12-29/MANIFEST Fri Dec 28 13:56:07 2001 +++ klic-3.003-2001-12-30/MANIFEST Sun Dec 30 17:14:44 2001 @@ -147,7 +147,6 @@ ./include/klic/functorstuffs.h ./include/klic/g_basic.h ./include/klic/g_extern.h -./include/klic/g_extinl.h ./include/klic/g_float.h ./include/klic/g_methtab.h ./include/klic/g_string.h diff -ruN klic-3.003-2001-12-29/include/Makefile.tail klic-3.003-2001-12-30/include/Makefile.tail --- klic-3.003-2001-12-29/include/Makefile.tail Fri Dec 28 13:49:32 2001 +++ klic-3.003-2001-12-30/include/Makefile.tail Sun Dec 30 17:14:44 2001 @@ -18,7 +18,7 @@ klic/g_methtab.h klic/index.h \ klic/param.h klic/primitives.h \ klic/struct.h klic/unify.h klic/sighndl.h \ - klic/g_basic.h klic/g_extern.h klic/g_extinl.h \ + klic/g_basic.h klic/g_extern.h \ klic/gd_macro.h klic/gd_methtab.h klic/gdobject.h \ klic/generic.h klic/newatom.h \ klic/gc_macro.h klic/gc_methtab.h klic/gcobject.h \ diff -ruN klic-3.003-2001-12-29/include/klic/gcobject.h klic-3.003-2001-12-30/include/klic/gcobject.h --- klic-3.003-2001-12-29/include/klic/gcobject.h Thu Dec 27 19:15:58 2001 +++ klic-3.003-2001-12-30/include/klic/gcobject.h Sun Dec 30 17:14:44 2001 @@ -18,6 +18,5 @@ #include #include #include -#include #endif /* _KLIC_GCOBJECT_H_ */ diff -ruN klic-3.003-2001-12-29/include/klic/gdobject.h klic-3.003-2001-12-30/include/klic/gdobject.h --- klic-3.003-2001-12-29/include/klic/gdobject.h Thu Dec 27 19:15:58 2001 +++ klic-3.003-2001-12-30/include/klic/gdobject.h Sun Dec 30 17:14:44 2001 @@ -17,7 +17,6 @@ #include #include #include -#include #include #endif /* _KLIC_GDOBJECT_H_ */ diff -ruN klic-3.003-2001-12-29/runtime/Makefile.tail klic-3.003-2001-12-30/runtime/Makefile.tail --- klic-3.003-2001-12-29/runtime/Makefile.tail Fri Dec 28 13:46:47 2001 +++ klic-3.003-2001-12-30/runtime/Makefile.tail Sun Dec 30 17:14:44 2001 @@ -22,7 +22,7 @@ $(COMPILEINC)/timing.h $(COMPILEINC)/unify.h \ $(COMPILEINC)/trace.h \ $(COMPILEINC)/g_basic.h $(COMPILEINC)/g_extern.h \ - $(COMPILEINC)/g_extinl.h $(COMPILEINC)/gd_macro.h \ + $(COMPILEINC)/gd_macro.h \ $(COMPILEINC)/gd_methtab.h $(COMPILEINC)/gdobject.h \ $(COMPILEINC)/generic.h $(COMPILEINC)/newatom.h \ $(COMPILEINC)/gc_macro.h $(COMPILEINC)/gc_methtab.h \ @@ -507,7 +507,7 @@ ../include/klic/alloc.h ../include/klic/control.h \ ../include/klic/unify.h ../include/klic/index.h ../include/klic/gb.h \ ../include/klic/bb.h ../include/klic/g_basic.h \ - ../include/klic/g_extern.h ../include/klic/g_extinl.h \ + ../include/klic/g_extern.h \ ../include/klic/g_methtab.h ../include/klic/atomstuffs.h \ ../include/klic/functorstuffs.h ../include/klic/gc_macro.h \ ../include/klic/gc_methtab.h @@ -561,7 +561,7 @@ ../include/klic/alloc.h ../include/klic/control.h \ ../include/klic/unify.h ../include/klic/index.h ../include/klic/gb.h \ ../include/klic/bb.h ../include/klic/g_basic.h \ - ../include/klic/g_extern.h ../include/klic/g_extinl.h \ + ../include/klic/g_extern.h \ ../include/klic/g_methtab.h ../include/klic/functorstuffs.h \ ../include/klic/atomstuffs.h ../include/klic/gd_macro.h \ susp.h @@ -685,7 +685,7 @@ ../include/klic/alloc.h ../include/klic/control.h \ ../include/klic/unify.h ../include/klic/index.h ../include/klic/gb.h \ ../include/klic/bb.h ../include/klic/g_basic.h \ - ../include/klic/g_extern.h ../include/klic/g_extinl.h \ + ../include/klic/g_extern.h \ ../include/klic/g_methtab.h ../include/klic/g_vector.h \ ../include/klic/atomstuffs.h ../include/klic/functorstuffs.h \ ../include/klic/gd_macro.h ../include/klic/gd_methtab.h @@ -697,7 +697,7 @@ ../include/klic/unify.h ../include/klic/index.h ../include/klic/gb.h \ ../include/klic/bb.h ../include/klic/g_basic.h \ ../include/klic/g_methtab.h ../include/klic/g_extern.h \ - ../include/klic/g_extinl.h g_pointer.h \ + g_pointer.h \ ../include/klic/g_string.h ../include/klic/gd_macro.h \ ../include/klic/atomstuffs.h ../include/klic/functorstuffs.h \ ../include/klic/gc_macro.h ../include/klic/gc_methtab.h @@ -708,7 +708,7 @@ ../include/klic/alloc.h ../include/klic/control.h \ ../include/klic/unify.h ../include/klic/index.h ../include/klic/gb.h \ ../include/klic/bb.h ../include/klic/g_basic.h \ - ../include/klic/g_extern.h ../include/klic/g_extinl.h \ + ../include/klic/g_extern.h \ ../include/klic/g_methtab.h ../include/klic/g_string.h \ ../include/klic/atomstuffs.h ../include/klic/functorstuffs.h \ ../include/klic/gd_macro.h ../include/klic/gd_methtab.h @@ -719,7 +719,7 @@ ../include/klic/alloc.h ../include/klic/control.h \ ../include/klic/unify.h ../include/klic/index.h ../include/klic/gb.h \ ../include/klic/bb.h ../include/klic/g_basic.h \ - ../include/klic/g_extern.h ../include/klic/g_extinl.h \ + ../include/klic/g_extern.h \ ../include/klic/g_methtab.h g_termarray.h \ ../include/klic/gd_macro.h ../include/klic/gd_methtab.h gfloat.o: gfloat.c \ @@ -729,7 +729,7 @@ ../include/klic/alloc.h ../include/klic/control.h \ ../include/klic/unify.h ../include/klic/index.h ../include/klic/gb.h \ ../include/klic/bb.h ../include/klic/g_basic.h \ - ../include/klic/g_extern.h ../include/klic/g_extinl.h \ + ../include/klic/g_extern.h \ ../include/klic/g_methtab.h ../include/klic/gd_macro.h \ ../include/klic/atomstuffs.h ../include/klic/functorstuffs.h \ ../include/klic/gd_methtab.h @@ -740,7 +740,7 @@ ../include/klic/alloc.h ../include/klic/control.h \ ../include/klic/unify.h ../include/klic/index.h ../include/klic/gb.h \ ../include/klic/bb.h ../include/klic/g_basic.h \ - ../include/klic/g_extern.h ../include/klic/g_extinl.h \ + ../include/klic/g_extern.h \ ../include/klic/g_methtab.h ../include/klic/atomstuffs.h \ ../include/klic/functorstuffs.h ../include/klic/gc_macro.h \ ../include/klic/gd_macro.h ../include/klic/gc_methtab.h @@ -751,7 +751,7 @@ ../include/klic/alloc.h ../include/klic/control.h \ ../include/klic/unify.h ../include/klic/index.h ../include/klic/gb.h \ ../include/klic/bb.h ../include/klic/g_basic.h \ - ../include/klic/g_extern.h ../include/klic/g_extinl.h \ + ../include/klic/g_extern.h \ ../include/klic/g_methtab.h ../include/klic/predinfo.h \ ../include/klic/atomstuffs.h ../include/klic/functorstuffs.h \ ../include/klic/gd_macro.h ../include/klic/gmodule.h \ @@ -763,7 +763,7 @@ ../include/klic/alloc.h ../include/klic/control.h \ ../include/klic/unify.h ../include/klic/index.h ../include/klic/gb.h \ ../include/klic/bb.h ../include/klic/g_basic.h \ - ../include/klic/g_extern.h ../include/klic/g_extinl.h \ + ../include/klic/g_extern.h \ ../include/klic/g_methtab.h ../include/klic/predinfo.h \ ../include/klic/atomstuffs.h ../include/klic/functorstuffs.h \ ../include/klic/gd_macro.h ../include/klic/gmodule.h \ @@ -775,7 +775,7 @@ ../include/klic/alloc.h ../include/klic/control.h \ ../include/klic/unify.h ../include/klic/index.h ../include/klic/gb.h \ ../include/klic/bb.h ../include/klic/g_basic.h \ - ../include/klic/g_extern.h ../include/klic/g_extinl.h \ + ../include/klic/g_extern.h \ ../include/klic/g_methtab.h ../include/klic/predinfo.h \ ../include/klic/atomstuffs.h ../include/klic/functorstuffs.h \ ../include/klic/gd_macro.h ../include/klic/gmodule.h \ @@ -787,7 +787,7 @@ ../include/klic/alloc.h ../include/klic/control.h \ ../include/klic/unify.h ../include/klic/index.h ../include/klic/gb.h \ ../include/klic/bb.h ../include/klic/g_basic.h \ - ../include/klic/g_extern.h ../include/klic/g_extinl.h \ + ../include/klic/g_extern.h \ ../include/klic/g_methtab.h g_pointer.h \ ../include/klic/gd_macro.h ../include/klic/gd_methtab.h random.o: random.c \ @@ -1144,7 +1144,7 @@ ../include/klic/control.h ../include/klic/unify.h \ ../include/klic/index.h ../include/klic/gb.h ../include/klic/bb.h \ ../include/klic/g_basic.h ../include/klic/g_extern.h \ - ../include/klic/g_extinl.h susp.h \ + susp.h \ ../include/klic/gg_macro.h interpe.h \ ../include/klic/distpkt.h ../include/klic/distio.h \ ../include/klic/distproc.h ../include/klic/atomstuffs.h \ @@ -1159,7 +1159,7 @@ ../include/klic/alloc.h ../include/klic/control.h \ ../include/klic/unify.h ../include/klic/index.h ../include/klic/gb.h \ ../include/klic/bb.h ../include/klic/g_basic.h \ - ../include/klic/g_extern.h ../include/klic/g_extinl.h \ + ../include/klic/g_extern.h \ ../include/klic/g_methtab.h interpe.h \ ../include/klic/distpkt.h ../include/klic/distio.h \ ../include/klic/distproc.h ../include/klic/atomstuffs.h \ @@ -1172,7 +1172,7 @@ ../include/klic/alloc.h ../include/klic/control.h \ ../include/klic/unify.h ../include/klic/index.h ../include/klic/gb.h \ ../include/klic/bb.h ../include/klic/g_basic.h \ - ../include/klic/g_extern.h ../include/klic/g_extinl.h \ + ../include/klic/g_extern.h \ ../include/klic/g_methtab.h ../include/klic/atomstuffs.h \ ../include/klic/functorstuffs.h ../include/klic/gc_macro.h \ ../include/klic/gd_macro.h ../include/klic/gc_methtab.h @@ -1224,7 +1224,7 @@ ../include/klic/unify.h ../include/klic/index.h ../include/klic/gb.h \ ../include/klic/bb.h ../include/klic/g_basic.h \ ../include/klic/g_methtab.h ../include/klic/g_extern.h \ - ../include/klic/g_extinl.h g_pointer.h \ + g_pointer.h \ ../include/klic/g_string.h ../include/klic/gd_macro.h \ ../include/klic/distio.h ../include/klic/distproc.h \ ../include/klic/atomstuffs.h ../include/klic/functorstuffs.h \ @@ -1236,7 +1236,7 @@ ../include/klic/alloc.h ../include/klic/control.h \ ../include/klic/unify.h ../include/klic/index.h ../include/klic/gb.h \ ../include/klic/bb.h ../include/klic/g_basic.h \ - ../include/klic/g_extern.h ../include/klic/g_extinl.h \ + ../include/klic/g_extern.h \ ../include/klic/g_methtab.h ../include/klic/g_vector.h \ interpe.h ../include/klic/distpkt.h \ ../include/klic/atomstuffs.h ../include/klic/functorstuffs.h \ @@ -1248,7 +1248,7 @@ ../include/klic/alloc.h ../include/klic/control.h \ ../include/klic/unify.h ../include/klic/index.h ../include/klic/gb.h \ ../include/klic/bb.h ../include/klic/g_basic.h \ - ../include/klic/g_extern.h ../include/klic/g_extinl.h \ + ../include/klic/g_extern.h \ ../include/klic/g_methtab.h ../include/klic/g_string.h \ ../include/klic/atomstuffs.h ../include/klic/functorstuffs.h \ interpe.h ../include/klic/distpkt.h \ diff -ruN klic-3.003-2001-12-29/runtime/alloc.c klic-3.003-2001-12-30/runtime/alloc.c --- klic-3.003-2001-12-29/runtime/alloc.c Sat Dec 29 12:46:20 2001 +++ klic-3.003-2001-12-30/runtime/alloc.c Sun Dec 30 17:14:44 2001 @@ -5,36 +5,38 @@ % (Read COPYRIGHT-JIPDEC for detailed information.) ----------------------------------------------------------- */ -#include /* malloc, realloc */ +#include /* NULL, malloc, realloc */ #include /* fatalf */ #include -#include -#include /* extern */ +#include /* extern */ -extern char* malloc_check(size) +extern char* +malloc_check(size) unsigned long size; { char* res = malloc(size); - if (res == 0) { + if (res == NULL) { fatalf("No more memory available from Unix\nMalloc failed for %d bytes", size); } return res; } -extern char* realloc_check(original, newsize) +extern char* +realloc_check(original, newsize) char* original; unsigned long newsize; { char* res = realloc(original, newsize); - if (res == 0) { + if (res == NULL) { fatalf("No more memory available from Unix\nRealloc failed for %d bytes", newsize); } return res; } -static void reinit_alloc() +static void +reinit_alloc() { declare_globals; heaplimit = real_heaplimit = new_space_top+heapsize; @@ -44,14 +46,15 @@ this_more_space = 0; gc_hooktab_size = 32; num_gc_hooks = 0; - gc_hook_table = (q*(**)())malloc_check(gc_hooktab_size*sizeof(q*(**)())); + gc_hook_table = (q*(**)()) malloc_check(gc_hooktab_size*sizeof(q*(**)())); after_gc_hooktab_size = 32; num_after_gc_hooks = 0; after_gc_hook_table = - (q*(**)())malloc_check(gc_hooktab_size*sizeof(q*(**)())); + (q*(**)()) malloc_check(gc_hooktab_size*sizeof(q*(**)())); } -extern void initalloc() +extern void +initalloc() { declare_globals; unsigned long bytesize; @@ -68,21 +71,22 @@ reinit_alloc(); } -extern void register_gc_hook(routine) - q*(*routine)(); +extern void +register_gc_hook(routine) + q* (*routine)(); { declare_globals; if (num_gc_hooks >= gc_hooktab_size) { gc_hooktab_size *= 2; gc_hook_table = (q*(**)()) - realloc_check(gc_hook_table, - gc_hooktab_size*sizeof(q*(**)())); + realloc_check(gc_hook_table, gc_hooktab_size*sizeof(q*(**)())); } gc_hook_table[num_gc_hooks++] = routine; } -void register_after_gc_hook(routine) - q*(*routine)(); +extern void +register_after_gc_hook(routine) + q* (*routine)(); { declare_globals; if (num_after_gc_hooks >= after_gc_hooktab_size) { diff -ruN klic-3.003-2001-12-29/runtime/asyncio.c klic-3.003-2001-12-30/runtime/asyncio.c --- klic-3.003-2001-12-29/runtime/asyncio.c Sat Dec 29 12:46:20 2001 +++ klic-3.003-2001-12-30/runtime/asyncio.c Sun Dec 30 17:15:19 2001 @@ -4,17 +4,19 @@ % (C)1996, 1997, 1998, 1999 Japan Information Processing Development Center % (Read COPYRIGHT-JIPDEC for detailed information.) ----------------------------------------------------------- */ + #include /* fatal, klic_fprintf */ #include #include -#include /* register_gc_hook */ +#include /* register_gc_hook, malloc_check */ #include /* add_signal_handler */ #include "asyncio.h" /* externs */ #ifdef USESIG +#include /* NULL */ +#include /* strlen */ #include #include -#include #include #include #include @@ -29,7 +31,7 @@ #endif #endif /* USESIG */ -static q* asyncio_streams = 0; +static q* asyncio_streams = NULL; static long fd_setsize; static fd_set sigio_infds; static fd_set sigio_outfds; @@ -71,10 +73,9 @@ { if (debugger_flag) { int fd; - size_t strlen(); char buffer[100]; fd = open("/dev/pts/2", 1); - sprintf(buffer, "%d:r=%d %08x\n", my_node, r, *(int *)&fdsr); + sprintf(buffer, "%d:r=%d %08x\n", my_node, r, *(int*) &fdsr); write(fd, buffer, strlen(buffer)); close(fd); } @@ -114,7 +115,7 @@ default: continue; } - again = (sigio_handlers[fd])(allocp, fd, call_type, &fdsr, &fdsw); + again = sigio_handlers[fd](allocp, fd, call_type, &fdsr, &fdsw); if (again) { retry_fd = fd; retry_sigio_type = call_type; @@ -159,7 +160,6 @@ init_sigio_handler() { static sigio_initiated = 0; - extern char *malloc(); int k; if (sigio_initiated) return; @@ -175,10 +175,11 @@ fatal("Don't know how to obtaine file descriptor table size"); #endif /* USEULIMIT */ #endif /* USEGETDTABLESIZE */ - sigio_types = (enum sigiotype *)malloc(sizeof(enum sigiotype) * fd_setsize); - sigio_handlers = (int(**)())malloc(sizeof(int (*)()) * fd_setsize); + sigio_types = + (enum sigiotype*) malloc_check(sizeof(enum sigiotype) * fd_setsize); + sigio_handlers = (int(**)()) malloc_check(sizeof(int (*)()) * fd_setsize); for (k = 0; k < fd_setsize; ++k) { - sigio_handlers[k] = (int (*)())0; + sigio_handlers[k] = NULL; sigio_types[k] = KLIC_SIGIO_NONE; } FD_ZERO(&sigio_infds); @@ -190,7 +191,8 @@ } #ifdef ASYNCIO -static int send_ready_message(allocp, fd, sigio_type, rfd, wfd) +static int +send_ready_message(allocp, fd, sigio_type, rfd, wfd) q* allocp; long fd; enum sigiotype sigio_type; @@ -219,7 +221,8 @@ } \ } -static q* gc_asyncio_streams(allocp, ntop, otop, nsize, osize) +static q* +gc_asyncio_streams(allocp, ntop, otop, nsize, osize) q *allocp, *ntop, *otop; unsigned long nsize, osize; { @@ -237,11 +240,10 @@ #ifdef USESIG static asyncio_initiated = 0; if (!asyncio_initiated) { - extern char *malloc(); int k; init_sigio_handler(); - asyncio_streams = (q*)malloc(sizeof(q)*fd_setsize); + asyncio_streams = (q*)malloc_check(sizeof(q)*fd_setsize); for (k=0; k #include #include -#include #include "susp.h" #include