From 94a4e45d08bf09d511dfbab6b5f7c369c96184dc Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Fri, 5 Aug 2011 20:32:11 +0000
Subject: [PATCH] type fix for Visual Studio

---
 ChangeLog                  |  4 ++++
 src/spicelib/devices/dev.c | 18 ++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c22d326ff..c8265e911 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-05  Robert Larice
+ * src/spicelib/devices/dev.c :
+   type fix for Visual Studio
+
 2011-08-05  Robert Larice
  * src/include/ngspice.h :
    disable Visual Studio "warning: C4127: conditional expression is constant"
diff --git a/src/spicelib/devices/dev.c b/src/spicelib/devices/dev.c
index d66955972..5fe0349b8 100644
--- a/src/spicelib/devices/dev.c
+++ b/src/spicelib/devices/dev.c
@@ -50,9 +50,12 @@
 #include <windows.h>
 #ifdef HAS_WINDOWS
 #include "wstdio.h"
+typedef FARPROC funptr_t;
+#else
+typedef void *  funptr_t;
 #endif
 void *dlopen (const char *, int);
-void *dlsym (void *, const char *);
+funptr_t dlsym (void *, const char *);
 int dlclose (void *);
 char *dlerror (void);
 #define RTLD_LAZY	1	/* lazy function call binding */
@@ -302,7 +305,7 @@ int load_dev(char *name) {
   char *msg;
   char libname[50];
   void *lib;
-  SPICEdev *(*fetch)(void)=NULL;
+  funptr_t fetch;
   SPICEdev *device;
 
   strcpy(libname, "lib");
@@ -326,7 +329,7 @@ int load_dev(char *name) {
     printf("%s\n", msg);
     return 1;
   }
-  device = fetch();
+  device = ((SPICEdev * (*)(void)) fetch) ();
   add_device(1,&device,0);
   return 0;
 }
@@ -406,7 +409,7 @@ int load_opus(char *name){
   struct coreInfo_t **core;
   SPICEdev **devs;
   Evt_Udn_Info_t  **udns;
-  void *fetch = NULL;
+  funptr_t fetch;
 
   lib = dlopen(name,RTLD_NOW);
   if(!lib){
@@ -421,7 +424,6 @@ int load_opus(char *name){
 #ifdef TRACE
     printf("Got %u devices.\n",*num);
 #endif
-    fetch = NULL;
   }else{
     msg = dlerror();
     printf("%s\n", msg);
@@ -431,7 +433,6 @@ int load_opus(char *name){
   fetch = dlsym(lib,"CMdevs");
   if(fetch){
     devs = ((SPICEdev ** (*)(void)) fetch) ();
-    fetch = NULL;
   }else{
     msg = dlerror();
     printf("%s\n", msg);
@@ -442,7 +443,6 @@ int load_opus(char *name){
   if(fetch){
     core = ((struct coreInfo_t ** (*)(void)) fetch) ();
     *core = &coreInfo;
-    fetch = NULL;
   }else{
     msg = dlerror();
     printf("%s\n", msg);
@@ -456,7 +456,6 @@ int load_opus(char *name){
 #ifdef TRACE
     printf("Got %u udns.\n",*num);
 #endif
-    fetch = NULL;
   }else{
     msg = dlerror();
     printf("%s\n", msg);
@@ -466,7 +465,6 @@ int load_opus(char *name){
   fetch = dlsym(lib,"CMudns");
   if(fetch){
     udns = ((Evt_Udn_Info_t  ** (*)(void)) fetch) ();
-    fetch = NULL;
   }else{
     msg = dlerror();
     printf("%s\n", msg);
@@ -486,7 +484,7 @@ void *dlopen(const char *name,int type)
 	return LoadLibrary(name);
 }
 
-void *dlsym(void *hDll, const char *funcname)
+funptr_t dlsym(void *hDll, const char *funcname)
 {
 	return GetProcAddress(hDll, funcname);
 }