--- gforth/prims2cl.fs	1999/03/02 15:50:04	1.1
+++ gforth/prims2cl.fs	2012/03/13 19:33:31	1.10
@@ -1,12 +1,12 @@
 \ prims2cl.fs	Primitives to c-library code
 
-\ Copyright (C) 1998 Free Software Foundation, Inc.
+\ Copyright (C) 1998,1999,2001,2003,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 \ GNU General Public License for more details.
 
 \ You should have received a copy of the GNU General Public License
-\ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 \ Author: Jens Wilke
 \ Revision Log
@@ -27,15 +26,15 @@ include ./prims2x.fs
 Create 	InputFile 130 chars allot
 
 : c-code
-    InputFile count ['] output-c-func process-file
+    InputFile count ['] output-c-func ['] abort process-file
     ;
 
 : c-names
-    InputFile count ['] output-funclabel process-file
+    InputFile count ['] output-funclabel ['] abort process-file
     ;
 
 : forth-names
-    InputFile count ['] output-forthname process-file
+    InputFile count ['] output-forthname dup process-file
     ;
 
 : .\ 
@@ -43,15 +42,13 @@ Create 	InputFile 130 chars allot
  
 : c-header
 	.\ #include "engine/forth.h"
-	.\ extern char *cstr(Char *from, UCell size, int clear);
-	.\ extern char *tilde_cstr(Char *from, UCell size, int clear);
 	.\ 
 	.\ #undef TOS
 	.\ #define TOS sp[0]
 	.\ #undef IF_TOS
 	.\ #define IF_TOS(x)
 	.\ #undef NEXT_P2
-	.\ #define NEXT_P2 return
+	.\ #define NEXT_P2 
 	.\ #undef NEXT_P1
 	.\ #define NEXT_P1
 	.\ #undef NEXT_P0
@@ -63,11 +60,6 @@ Create 	InputFile 130 chars allot
 	.\ #undef I_
 	.\ #define I_ I_
 	.\
-	.\ extern int *FP;
-	.\ extern int *SP;
-	.\ #define sp SP
-	.\ #define fp FP
-	.\
 	.\ #define NAME_LEN 32
 	.\ #define NULL 0
 	.\