diff --git a/ChangeLog b/ChangeLog
index 845e0c81..e926cdcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-01-20  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* demo/dlmain.c (main): cast s->address to the appropriate pointer
+ 	types, otherwise StunOS4's cc refuses to compile it
+
 	* ltconfig.in (sunos4*, without_gnu_ld, with_gcc, archive_cmds):
  	add -fPIC, because libgcc is multilibbed, and we want the PIC
  	version of it for shared libraries, otherwise ld complains
diff --git a/demo/dlmain.c b/demo/dlmain.c
index 8d901cbd..32c8c6e0 100644
--- a/demo/dlmain.c
+++ b/demo/dlmain.c
@@ -76,11 +76,11 @@ main (argc, argv)
         const char *name = s->name;
         printf ("found symbol: %s\n", name);
         if (!strcmp ("hello", name))
- 	  phello = s->address;
+ 	  phello = (int(*)())s->address;
         else if (!strcmp ("foo", name))
-  	  pfoo = s->address;
+  	  pfoo = (int(*)())s->address;
         else if (!strcmp ("nothing", name))
-  	  pnothing = s->address;
+  	  pnothing = (int*)s->address;
       } else 
         printf ("found file: %s\n", s->name);
       s ++;