From fa4223c54490660d3d694d0449309013de1d4525 Mon Sep 17 00:00:00 2001
From: Jens Maus <mail@jens-maus.de>
Date: Tue, 11 Mar 2008 07:37:31 +0000
Subject: [PATCH] [tboeckel]: when compiling amiga_rexxvars.c for m68k/OS3 the
 GetRexxVarFromMsg() and SetRexxVarFromMsg() will not be used and therefore
 not cause linkage errors with our libamiga.a stubs anymore.

git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@15180 87f5fb63-7c3d-0410-a384-fd976d0f7a62
---
 library/amiga_rexxvars.c | 16 ++++++++++++----
 library/changes          |  6 +++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/library/amiga_rexxvars.c b/library/amiga_rexxvars.c
index f033cef..e098458 100644
--- a/library/amiga_rexxvars.c
+++ b/library/amiga_rexxvars.c
@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_rexxvars.c,v 1.10 2006-09-25 18:19:44 obarthel Exp $
+ * $Id: amiga_rexxvars.c,v 1.11 2008-03-11 07:37:31 damato Exp $
  *
  * :ts=4
  *
@@ -142,7 +142,7 @@ CheckRexxMsg(struct RexxMsg *message)
 	if(message->rm_TaskBlock == NULL)
 		goto out;
 
-	if(NOT IsRexxMsg((struct Message *)message))
+	if(NOT IsRexxMsg(message))
 		goto out;
 
 	result = TRUE;
@@ -163,9 +163,10 @@ GetRexxVar(struct RexxMsg *message,STRPTR variable_name,STRPTR *buffer_pointer)
 	static TEXT buffer[256];
 	LONG result;
 
+#if defined(__amigaos4__)
 	/* The following uses a function which was added to rexxsyslib.library V45.
 	   We therefore have a minimum library version requirement. */
-	if(RexxSysBase == NULL || RexxSysBase->lib_Version < 45 || NOT IsRexxMsg((struct Message *)message))
+	if(RexxSysBase == NULL || RexxSysBase->lib_Version < 45 || NOT IsRexxMsg(message))
 	{
 		result = ERR10_010; /* invalid message packet */
 		goto out;
@@ -173,6 +174,9 @@ GetRexxVar(struct RexxMsg *message,STRPTR variable_name,STRPTR *buffer_pointer)
 
 	/* The 256 character limit isn't good. This should be done differently. */
 	result = GetRexxVarFromMsg(variable_name,buffer,message);
+#else
+	result = ERR10_015; /* function not found */
+#endif
 	if(result != 0)
 		goto out;
 
@@ -193,15 +197,19 @@ SetRexxVar(struct RexxMsg *message,STRPTR variable_name,STRPTR value,ULONG lengt
 {
 	LONG result;
 
+#if defined(__amigaos4__)
 	/* The following uses a function which was added to rexxsyslib.library V45.
 	   We therefore have a minimum library version requirement. */
-	if(RexxSysBase == NULL || RexxSysBase->lib_Version < 45 || NOT IsRexxMsg((struct Message *)message))
+	if(RexxSysBase == NULL || RexxSysBase->lib_Version < 45 || NOT IsRexxMsg(message))
 	{
 		result = ERR10_010; /* invalid message packet */
 		goto out;
 	}
 
 	result = SetRexxVarFromMsg(variable_name,value,message);
+#else
+	result = ERR10_015; /* function not found */
+#endif
 
  out:
 
diff --git a/library/changes b/library/changes
index 73deb2d..72bcef7 100644
--- a/library/changes
+++ b/library/changes
@@ -3,9 +3,9 @@
   feature and the way clib2 treats it for now is just intended to avoid
   trouble while performing the conversion.
 
-- [jlangner]: changed the GNUmakefile.68k to also build soft-float variants of all
-  our libraries. In addition the specs file now also respects the -msoft-float
-  option at link time and sets the default link directory accordingly.
+- [tboeckel]: when compiling amiga_rexxvars.c for m68k/OS3 the GetRexxVarFromMsg()
+  and SetRexxVarFromMsg() will not be used and therefore not cause linkage errors
+  with our libamiga.a stubs anymore.
 
 - [jlangner]: the log() and log10() functions always returned -inf() even if the
   arguments was within the valid range for a log() function. Using DBL_EPSILON as