--- a/ExtFunc.st	Fri Jan 12 16:27:52 1996 +0100
+++ b/ExtFunc.st	Fri Jan 12 16:28:45 1996 +0100
@@ -17,14 +17,6 @@
 	 category:'System-Support'
 !
 
-!ExternalFunction primitiveDefinitions!
-%{
-#ifdef NOTDEF /* already in stc.h */
-    typedef int (* INTFUNC)();     /* a function returning an int */
-#endif
-%}   
-! !
-
 !ExternalFunction primitiveFunctions!
 %{
 
@@ -154,8 +146,8 @@
     |retVal called|
 
 %{
-    extern int stxNCustomFunctions;
-    extern CUSTOMFUNCTION customFunctions[];
+    extern int __stxNCustomFunctions__;
+    extern CUSTOMFUNCTION __stxCustomFunctions__[];
     int (* func)();
 
     called = false;
@@ -164,11 +156,11 @@
 	int functionNr;
 
 	functionNr = _intVal(nr);
-	if ((functionNr >= 0) && (functionNr < stxNCustomFunctions)) {
+	if ((functionNr >= 0) && (functionNr < __stxNCustomFunctions__)) {
 	    /*
 	     * now, call the function; passing nargs and arg-vector
 	     */
-	    func = customFunctions[functionNr].func;
+	    func = __stxCustomFunctions__[functionNr].func;
 	    if (func) {
 		int ok;
 
@@ -222,16 +214,16 @@
 indexOfCustomFunctionNamed:functionName
 
 %{  /* NOCONTEXT */
-    extern int stxNCustomFunctions;
-    extern CUSTOMFUNCTION customFunctions[];
+    extern int __stxNCustomFunctions__;
+    extern CUSTOMFUNCTION __stxCustomFunctions__[];
 
     if (__isString(functionName)) {
 	char *nm;
 	int i;
 
 	nm = _stringVal(functionName);
-	for (i=0; i<stxNCustomFunctions; i++) {
-	   if (strcmp(customFunctions[i].name, nm) == 0) {
+	for (i=0; i < __stxNCustomFunctions__; i++) {
+	   if (strcmp(__stxCustomFunctions__[i].name, nm) == 0) {
 		RETURN (_MKSMALLINT(i));
 	   }
 	}
@@ -371,6 +363,6 @@
 !ExternalFunction class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Attic/ExtFunc.st,v 1.1 1996-01-11 13:51:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Attic/ExtFunc.st,v 1.2 1996-01-12 15:28:45 cg Exp $'
 ! !
 ExternalFunction initialize!

--- a/ExternalFunction.st	Fri Jan 12 16:27:52 1996 +0100
+++ b/ExternalFunction.st	Fri Jan 12 16:28:45 1996 +0100
@@ -17,14 +17,6 @@
 	 category:'System-Support'
 !
 
-!ExternalFunction primitiveDefinitions!
-%{
-#ifdef NOTDEF /* already in stc.h */
-    typedef int (* INTFUNC)();     /* a function returning an int */
-#endif
-%}   
-! !
-
 !ExternalFunction primitiveFunctions!
 %{
 
@@ -154,8 +146,8 @@
     |retVal called|
 
 %{
-    extern int stxNCustomFunctions;
-    extern CUSTOMFUNCTION customFunctions[];
+    extern int __stxNCustomFunctions__;
+    extern CUSTOMFUNCTION __stxCustomFunctions__[];
     int (* func)();
 
     called = false;
@@ -164,11 +156,11 @@
 	int functionNr;
 
 	functionNr = _intVal(nr);
-	if ((functionNr >= 0) && (functionNr < stxNCustomFunctions)) {
+	if ((functionNr >= 0) && (functionNr < __stxNCustomFunctions__)) {
 	    /*
 	     * now, call the function; passing nargs and arg-vector
 	     */
-	    func = customFunctions[functionNr].func;
+	    func = __stxCustomFunctions__[functionNr].func;
 	    if (func) {
 		int ok;
 
@@ -222,16 +214,16 @@
 indexOfCustomFunctionNamed:functionName
 
 %{  /* NOCONTEXT */
-    extern int stxNCustomFunctions;
-    extern CUSTOMFUNCTION customFunctions[];
+    extern int __stxNCustomFunctions__;
+    extern CUSTOMFUNCTION __stxCustomFunctions__[];
 
     if (__isString(functionName)) {
 	char *nm;
 	int i;
 
 	nm = _stringVal(functionName);
-	for (i=0; i<stxNCustomFunctions; i++) {
-	   if (strcmp(customFunctions[i].name, nm) == 0) {
+	for (i=0; i < __stxNCustomFunctions__; i++) {
+	   if (strcmp(__stxCustomFunctions__[i].name, nm) == 0) {
 		RETURN (_MKSMALLINT(i));
 	   }
 	}
@@ -371,6 +363,6 @@
 !ExternalFunction class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ExternalFunction.st,v 1.1 1996-01-11 13:51:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ExternalFunction.st,v 1.2 1996-01-12 15:28:45 cg Exp $'
 ! !
 ExternalFunction initialize!