retry [PATCH] 5.004_59: the perlhist.pod etc

[p5sagit/p5-mst-13.2.git] / win32 / dl_win32.xs

diff --git a/win32/dl_win32.xs b/win32/dl_win32.xs
index 47d06c0..0f869e1 100644 (file)
--- a/win32/dl_win32.xs
+++ b/win32/dl_win32.xs
@@ -18,6 +18,9 @@ calls.
 */
 
 #define WIN32_LEAN_AND_MEAN
+#ifdef __GNUC__
+#define Win32_Winsock
+#endif
 #include <windows.h>
 #include <string.h>
 
@@ -28,7 +31,7 @@ calls.
 #include "dlutils.c"   /* SaveError() etc      */
 
 static void
-dl_private_init()
+dl_private_init(void)
 {
     (void)dl_generic_private_init();
 }
@@ -36,11 +39,11 @@ dl_private_init()
 static int
 dl_static_linked(char *filename)
 {
-       char **p;
+    char **p;
     for (p = staticlinkmodules; *p;p++) {
-               if (strstr(filename, *p)) return 1;
-               };
-       return 0;
+       if (strstr(filename, *p)) return 1;
+    };
+    return 0;
 }
 
 MODULE = DynaLoader    PACKAGE = DynaLoader
@@ -55,10 +58,10 @@ dl_load_file(filename,flags=0)
     PREINIT:
     CODE:
     DLDEBUG(1,fprintf(stderr,"dl_load_file(%s):\n", filename));
-       if (dl_static_linked(filename) == 0)
-       RETVAL = (void*) LoadLibraryEx(filename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH ) ;
-       else
-               RETVAL = (void*) GetModuleHandle(NULL);
+    if (dl_static_linked(filename) == 0)
+       RETVAL = (void*) LoadLibraryEx(filename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH ) ;
+    else
+       RETVAL = (void*) GetModuleHandle(NULL);
     DLDEBUG(2,fprintf(stderr," libref=%x\n", RETVAL));
     ST(0) = sv_newmortal() ;
     if (RETVAL == NULL)
@@ -73,7 +76,7 @@ dl_find_symbol(libhandle, symbolname)
     char *     symbolname
     CODE:
     DLDEBUG(2,fprintf(stderr,"dl_find_symbol(handle=%x, symbol=%s)\n",
-       libhandle, symbolname));
+                     libhandle, symbolname));
     RETVAL = (void*) GetProcAddress((HINSTANCE) libhandle, symbolname);
     DLDEBUG(2,fprintf(stderr,"  symbolref = %x\n", RETVAL));
     ST(0) = sv_newmortal() ;
@@ -98,8 +101,8 @@ dl_install_xsub(perl_name, symref, filename="$Package")
     char *             filename
     CODE:
     DLDEBUG(2,fprintf(stderr,"dl_install_xsub(name=%s, symref=%x)\n",
-               perl_name, symref));
-    ST(0)=sv_2mortal(newRV((SV*)newXS(perl_name, (void(*)())symref, filename)));
+                     perl_name, symref));
+    ST(0)=sv_2mortal(newRV((SV*)newXS(perl_name, (void(*)(CV*))symref, filename)));
 
 
 char *