From fd15801af86d6d309bc0e6ca47bef78faef916a7 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Fri, 5 Mar 2021 16:36:13 +0100
Subject: [PATCH] fix deprecation warnings for VxWorks 6.9

---
 require.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/require.c b/require.c
index 2536d62..c2bb335 100644
--- a/require.c
+++ b/require.c
@@ -80,8 +80,16 @@ int requireDebug;
     #define INFIX "Lib"
     #define EXT ".munch"
 
-    #define getAddress(module, name) __extension__ \
-        ({SYM_TYPE t; char* a = NULL; symFindByName(sysSymTbl, (name), &a, &t); a;})
+    #if _WRS_VXWORKS_MAJOR*10+_WRS_VXWORKS_MINOR*1+_WRS_VXWORKS_MAINT < 69
+        #define FUNCTYPE (FUNCPTR)
+        #define getAddress(module, name) __extension__ \
+            ({SYM_TYPE t; char* a = NULL; symFindByName(sysSymTbl, (name), &a, &t); a;})
+    #else
+        #define FUNCTYPE
+        #define getAddress(module, name) \
+            ({SYMBOL_DESC s={SYM_FIND_BY_NAME, (name), 0, 0, 0, 0}; symFind(sysSymTbl, &s); s.value;})
+    #endif
+
 
 #ifndef _WRS_VXWORKS_MAJOR
     /* vxWorks 5 has no snprintf() */
@@ -687,11 +695,11 @@ void registerModule(const char* module, const char* version, const char* locatio
 
 #if defined (vxWorks)
 static BOOL findLibRelease (
-    char      *name,  /* symbol name       */
-    int       val,    /* value of symbol   */
-    SYM_TYPE  type,   /* symbol type       */
-    int       arg,    /* user-supplied arg */
-    UINT16    group   /* group number      */
+    char          *name,  /* symbol name       */
+    char*         val,    /* value of symbol   */
+    SYM_TYPE      type,   /* symbol type       */
+    int           arg,    /* user-supplied arg */
+    UINT16        group   /* group number      */
 ) {
     /* find symbols with a name like "_<module>LibRelease" */
     char* module;
@@ -705,7 +713,7 @@ static BOOL findLibRelease (
     module = strdup(name+1);                  /* remove '_' */
     module[lm-1]=0;                           /* remove "libRelase" */
     if (getLibVersion(module) == NULL)
-        registerModule(module, (char*)val, NULL);
+        registerModule(module, val, NULL);
     free(module);
     return TRUE;
 }
@@ -713,7 +721,7 @@ static BOOL findLibRelease (
 void registerExternalModules()
 {
     /* iterate over all symbols */
-    symEach(sysSymTbl, (FUNCPTR)findLibRelease, 0);
+    symEach(sysSymTbl, FUNCTYPE findLibRelease, 0);
 }
 
 #elif defined (__linux)