Remove fipscanister build functionality from makefiles.

[openssl.git] / crypto / dso / dso_dl.c

diff --git a/crypto/dso/dso_dl.c b/crypto/dso/dso_dl.c
index 7c123c8580d6f233f4856c167bb46c48fb213993..0a6986745335c0988fc39b001630808e8d520854 100644 (file)
--- a/crypto/dso/dso_dl.c
+++ b/crypto/dso/dso_dl.c
@@ -86,7 +86,7 @@ static int dl_ctrl(DSO *dso, int cmd, long larg, void *parg);
 static char *dl_name_converter(DSO *dso, const char *filename);
 static char *dl_merger(DSO *dso, const char *filespec1, const char *filespec2);
 static int dl_pathbyaddr(void *addr,char *path,int sz);
-static DSO_FUNC_TYPE dl_globallookup(const char *name);
+static void *dl_globallookup(const char *name);
 
 static DSO_METHOD dso_meth_dl = {
        "OpenSSL 'dl' shared library method",
@@ -124,7 +124,7 @@ static int dl_load(DSO *dso)
        shl_t ptr = NULL;
        /* We don't do any fancy retries or anything, just take the method's
         * (or DSO's if it has the callback set) best translation of the
-        * platform-independant filename and try once with that. */
+        * platform-independent filename and try once with that. */
        char *filename= DSO_convert_filename(dso, NULL);
 
        if(filename == NULL)
@@ -315,7 +315,7 @@ static char *dl_merger(DSO *dso, const char *filespec1, const char *filespec2)
  * unlikely that both the "dl" *and* "dlfcn" variants are being compiled at the
  * same time, there's no great duplicating the code. Figuring out an elegant 
  * way to share one copy of the code would be more difficult and would not
- * leave the implementations independant. */
+ * leave the implementations independent. */
 #if defined(__hpux)
 static const char extension[] = ".sl";
 #else
@@ -383,9 +383,9 @@ static int dl_pathbyaddr(void *addr,char *path,int sz)
        return -1;
        }
 
-static DSO_FUNC_TYPE dl_globallookup(const char *name)
+static void *dl_globallookup(const char *name)
        {
-       DSO_FUNC_TYPE ret;
+       void *ret;
        shl_t h = NULL;
 
        return shl_findsym(&h,name,TYPE_UNDEFINED,&ret) ? NULL : ret;