--- a/src/sysdll.c	Mon Aug 13 11:19:22 2007 +0200
+++ b/src/sysdll.c	Mon Aug 13 11:20:41 2007 +0200
@@ -23,7 +23,6 @@
 #include <config.h>
 #endif
 
-#include <stdlib.h>
 #include "sysdll.h"
 
 /* This whole file is conditional upon HAVE_SHLIB */
@@ -49,13 +48,13 @@
 #endif
 
 int
-dll_init (const char *arg)
+dll_init (CONST char *arg)
 {
   return 0;
 }
 
 dll_handle
-dll_open (const char *fname)
+dll_open (CONST char *fname)
 {
   return (dll_handle)dlopen (fname, RTLD_LAZY | RTLD_GLOBAL);
 }
@@ -67,7 +66,7 @@
 }
 
 dll_func
-dll_function (dll_handle h, const char *n)
+dll_function (dll_handle h, CONST char *n)
 {
 #ifdef DLSYM_NEEDS_UNDERSCORE
   char *buf = alloca_array (char, strlen (n) + 2);
@@ -79,7 +78,7 @@
 }
 
 dll_var
-dll_variable (dll_handle h, const char *n)
+dll_variable (dll_handle h, CONST char *n)
 {
 #ifdef DLSYM_NEEDS_UNDERSCORE
   char *buf = alloca_array (char, strlen (n) + 2);
@@ -90,11 +89,11 @@
   return (dll_var)dlsym ((void *)h, n);
 }
 
-const char *
+CONST char *
 dll_error (dll_handle h)
 {
 #if defined(HAVE_DLERROR) || defined(dlerror)
-  return (const char *)dlerror ();
+  return (CONST char *)dlerror ();
 #elif defined(HAVE__DLERROR)
   return (const char *)_dlerror();
 #else
@@ -106,13 +105,13 @@
 /* This is the HP/UX version */
 #include <dl.h>
 int
-dll_init (const char *arg)
+dll_init (CONST char *arg)
 {
   return 0;
 }
 
 dll_handle
-dll_open (const char *fname)
+dll_open (CONST char *fname)
 {
   shl_t h = shl_load (fname, BIND_DEFERRED,0L);
   shl_t *hp = NULL;
@@ -137,7 +136,7 @@
 }
 
 dll_func
-dll_function (dll_handle h, const char *n)
+dll_function (dll_handle h, CONST char *n)
 {
   long handle = 0L;
 
@@ -148,7 +147,7 @@
 }
 
 dll_var
-dll_variable (dll_handle h, const char *n)
+dll_variable (dll_handle h, CONST char *n)
 {
   long handle = 0L;
 
@@ -158,7 +157,7 @@
   return (dll_var)handle;
 }
 
-const char *
+CONST char *
 dll_error (dll_handle h)
 {
   /* #### WTF?!  Shouldn't this at least attempt to get strerror or
@@ -169,7 +168,7 @@
 #elif defined(HAVE_INIT_DLD)
 #include <dld.h>
 int
-dll_init (const char *arg)
+dll_init (CONST char *arg)
 {
   char *real_exe = dld_find_executable (arg);
   int rc;
@@ -184,7 +183,7 @@
 }
 
 dll_handle
-dll_open (const char *fname)
+dll_open (CONST char *fname)
 {
   rc = dld_link (fname);
   if (rc)
@@ -206,30 +205,25 @@
 }
 
 DLL_FUNC
-dll_function (dll_handle h, const char *n)
+dll_function (dll_handle h, CONST char *n)
 {
   return dld_get_func(n);
 }
 
 DLL_FUNC
-dll_variable (dll_handle h, const char *n)
+dll_variable (dll_handle h, CONST char *n)
 {
   return dld_get_symbol(n);
 }
-#elif defined (WIN32_NATIVE)
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
+#elif defined(_WINDOWS) || defined(WIN32)
 int
-dll_init (const char *arg)
+dll_init (CONST char *arg)
 {
   return 0;
 }
 
 dll_handle
-dll_open (const char *fname)
+dll_open (CONST char *fname)
 {
   return (dll_handle)LoadLibrary (fname);
 }
@@ -241,18 +235,18 @@
 }
 
 dll_func
-dll_function (dll_handle h, const char *n)
+dll_function (dll_handle h, CONST char *n)
 {
   return (dll_func)GetProcAddress (h,n);
 }
 
 dll_func
-dll_variable (dll_handle h, const char *n)
+dll_variable (dll_handle h, CONST char *n)
 {
   return (dll_func)GetProcAddress (h,n);
 }
 
-const char *
+CONST char *
 dll_error (dll_handle h)
 {
   return "Windows DLL Error";
@@ -260,13 +254,13 @@
 #else
 /* Catchall if we don't know about this systems method of dynamic loading */
 int
-dll_init (const char *arg)
+dll_init (CONST char *arg)
 {
   return -1;
 }
 
 dll_handle
-dll_open (const char *fname)
+dll_open (CONST char *fname)
 {
   return NULL;
 }
@@ -278,18 +272,18 @@
 }
 
 dll_func
-dll_function (dll_handle h, const char *n)
+dll_function (dll_handle h, CONST char *n)
 {
   return NULL;
 }
 
 dll_func
-dll_variable (dll_handle h, const char *n)
+dll_variable (dll_handle h, CONST char *n)
 {
   return NULL;
 }
 
-const char *
+CONST char *
 dll_error (dll_handle h)
 {
   return "Shared libraries not implemented on this system";