From: Ben H. <bh...@us...> - 2002-01-02 04:57:33
|
Update of /cvsroot/thinlisp/thinlisp-1.0/src/tl/c In directory usw-pr-cvs1:/tmp/cvs-serv13818/tl/c Modified Files: format.c format.h format.tlt tl-util.c tl-util.h tl-util.tlt tl.c tl.h Log Message: Do not use warn as a c name, it is used by mac os x. Also misc, copyright changes. Index: format.c =================================================================== RCS file: /cvsroot/thinlisp/thinlisp-1.0/src/tl/c/format.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** format.c 2001/07/15 15:43:10 1.9 --- format.c 2002/01/02 04:57:29 1.10 *************** *** 3,7 **** * Module: tl/c/format.c * ! * Copyright (c) 2001 The Thinlisp Group All Rights Reserved. * * Description: Translation of tl/lisp/format.lisp. --- 3,7 ---- * Module: tl/c/format.c * ! * Copyright (c) 2002 The Thinlisp Group All Rights Reserved. * * Description: Translation of tl/lisp/format.lisp. Index: format.h =================================================================== RCS file: /cvsroot/thinlisp/thinlisp-1.0/src/tl/c/format.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** format.h 2001/07/15 15:43:10 1.5 --- format.h 2002/01/02 04:57:29 1.6 *************** *** 3,7 **** * Module: tl/c/format.h * ! * Copyright (c) 2001 The Thinlisp Group All Rights Reserved. * * Description: Translation of tl/lisp/format.lisp. --- 3,7 ---- * Module: tl/c/format.h * ! * Copyright (c) 2002 The Thinlisp Group All Rights Reserved. * * Description: Translation of tl/lisp/format.lisp. Index: format.tlt =================================================================== RCS file: /cvsroot/thinlisp/thinlisp-1.0/src/tl/c/format.tlt,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** format.tlt 2001/07/15 15:43:10 1.7 --- format.tlt 2002/01/02 04:57:29 1.8 *************** *** 1,5 **** ;;;; Module tl/c/format.c ! ;;; Copyright (c) 2001 The Thinlisp Group All Rights Reserved. ;;; Translation data for tl/lisp/format.lisp. --- 1,5 ---- ;;;; Module tl/c/format.c ! ;;; Copyright (c) 2002 The Thinlisp Group All Rights Reserved. ;;; Translation data for tl/lisp/format.lisp. Index: tl-util.c =================================================================== RCS file: /cvsroot/thinlisp/thinlisp-1.0/src/tl/c/tl-util.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** tl-util.c 2001/07/15 15:43:10 1.10 --- tl-util.c 2002/01/02 04:57:29 1.11 *************** *** 3,7 **** * Module: tl/c/tl-util.c * ! * Copyright (c) 2001 The Thinlisp Group All Rights Reserved. * * Description: Translation of tl/lisp/tl-util.lisp. --- 3,7 ---- * Module: tl/c/tl-util.c * ! * Copyright (c) 2002 The Thinlisp Group All Rights Reserved. * * Description: Translation of tl/lisp/tl-util.lisp. Index: tl-util.h =================================================================== RCS file: /cvsroot/thinlisp/thinlisp-1.0/src/tl/c/tl-util.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** tl-util.h 2001/07/15 15:43:10 1.4 --- tl-util.h 2002/01/02 04:57:29 1.5 *************** *** 3,7 **** * Module: tl/c/tl-util.h * ! * Copyright (c) 2001 The Thinlisp Group All Rights Reserved. * * Description: Translation of tl/lisp/tl-util.lisp. --- 3,7 ---- * Module: tl/c/tl-util.h * ! * Copyright (c) 2002 The Thinlisp Group All Rights Reserved. * * Description: Translation of tl/lisp/tl-util.lisp. Index: tl-util.tlt =================================================================== RCS file: /cvsroot/thinlisp/thinlisp-1.0/src/tl/c/tl-util.tlt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** tl-util.tlt 2001/07/15 15:43:10 1.8 --- tl-util.tlt 2002/01/02 04:57:29 1.9 *************** *** 1,5 **** ;;;; Module tl/c/tl-util.c ! ;;; Copyright (c) 2001 The Thinlisp Group All Rights Reserved. ;;; Translation data for tl/lisp/tl-util.lisp. --- 1,5 ---- ;;;; Module tl/c/tl-util.c ! ;;; Copyright (c) 2002 The Thinlisp Group All Rights Reserved. ;;; Translation data for tl/lisp/tl-util.lisp. Index: tl.c =================================================================== RCS file: /cvsroot/thinlisp/thinlisp-1.0/src/tl/c/tl.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** tl.c 2001/07/02 02:04:13 1.19 --- tl.c 2002/01/02 04:57:29 1.20 *************** *** 36,40 **** --- 36,43 ---- #include <time.h> + static void notify_1(char *message); + static void warn_1(char *message); + Thread_state default_thread_state; *************** *** 502,506 **** sprintf(strchr(msg,0), "will also fail, and this program will exit.\n"); ! warn(msg); } else { sprintf(strchr(msg,0), --- 505,509 ---- sprintf(strchr(msg,0), "will also fail, and this program will exit.\n"); ! warn_1(msg); } else { sprintf(strchr(msg,0), *************** *** 524,528 **** sprintf(msg,"Obtaining more memory (region %d at %ld)\n", (int)region, (long)(region_used[region])); ! notify(msg); } --- 527,531 ---- sprintf(msg,"Obtaining more memory (region %d at %ld)\n", (int)region, (long)(region_used[region])); ! notify_1(msg); } *************** *** 620,624 **** sprintf(message,"Allocating %s from region %d when %d was expected.", type, (int)CURRENT_REGION_NUMBER, (int)region); ! warn(message); } --- 623,627 ---- sprintf(message,"Allocating %s from region %d when %d was expected.", type, (int)CURRENT_REGION_NUMBER, (int)region); ! warn_1(message); } *************** *** 1160,1169 **** } ! void notify (char *message) { printf("%s%s\n", current_time_string(), message); return; } ! void warn (char *message) { printf("%s**** WARNING ****\n%s\n", current_time_string(), message); return; --- 1163,1172 ---- } ! static void notify_1 (char *message) { printf("%s%s\n", current_time_string(), message); return; } ! static void warn_1 (char *message) { printf("%s**** WARNING ****\n%s\n", current_time_string(), message); return; Index: tl.h =================================================================== RCS file: /cvsroot/thinlisp/thinlisp-1.0/src/tl/c/tl.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** tl.h 2001/07/15 15:32:35 1.14 --- tl.h 2002/01/02 04:57:29 1.15 *************** *** 591,598 **** sint32 type_tag); - extern void notify(char *message); - - extern void warn(char *message); - extern void error(char *message); --- 591,594 ---- |