From: Gurusamy Sarathy <gsar@cpan.org>
Date: Tue, 17 Feb 1998 01:47:35 +0000 (+0000)
Subject: [win32] DLLs are now ok on mingw32/gcc-2.8.0 after removing the
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4a52a3daffadd96cbf5882659a7b4be69a820252;p=p5sagit%2Fp5-mst-13.2.git

[win32] DLLs are now ok on mingw32/gcc-2.8.0 after removing the
FORCE_ARG_STRING() hack (that bug is fixed in gcc now).  mingw32
build passes all tests except t/lib/io_xs.t (seems to be due to
broken tmpfile() in the CRT or import lib)

p4raw-id: //depot/win32/perl@530
---

diff --git a/XSUB.h b/XSUB.h
index 75e65cf..f01f497 100644
--- a/XSUB.h
+++ b/XSUB.h
@@ -6,7 +6,7 @@
 #define XS(name) void name(cv) CV* cv;
 #endif
 
-#if defined(WIN32) && defined(__GNUC__)
+#if 0 /*defined(WIN32) && defined(__GNUC__)*/ /* this bug is gone in mingw32/gcc-2.8.0*/
 #define STRINGIFY_THINGY(x) #x
 #define FORCE_ARG_STRING(x) STRINGIFY_THINGY(x)
 #else
@@ -50,7 +50,7 @@
 #ifdef XS_VERSION
 # define XS_VERSION_BOOTCHECK \
     STMT_START {							\
-        char *xs_version = FORCE_ARG_STRING(XS_VERSION);			\
+        char *xs_version = FORCE_ARG_STRING(XS_VERSION);		\
 	char *vn = "", *module = SvPV(ST(0),na);			\
 	if (items >= 2)	 /* version supplied as bootstrap arg */	\
 	    Sv = ST(1);							\
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 1e6c462..a6efca0 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -23,8 +23,8 @@ INST_TOP	*= $(INST_DRV)\perl5004.5x
 # uncomment one
 #CCTYPE		*= MSVC20
 #CCTYPE		*= MSVC
-#CCTYPE		*= BORLAND
-CCTYPE		*= GCC
+CCTYPE		*= BORLAND
+#CCTYPE		*= GCC
 
 #
 # uncomment next line if you want debug version of perl (big,slow)
@@ -43,8 +43,8 @@ CCTYPE		*= GCC
 #
 # set the install locations of the compiler include/libraries
 #CCHOME		*= f:\msdev\vc
-#CCHOME		*= C:\bc5
-CCHOME		*= D:\packages\mingw32
+CCHOME		*= C:\bc5
+#CCHOME		*= D:\packages\mingw32
 CCINCDIR	*= $(CCHOME)\include
 CCLIBDIR	*= $(CCHOME)\lib
 
@@ -128,7 +128,7 @@ EXEOUT_FLAG = -e
 .ELIF "$(CCTYPE)" == "GCC"
 
 CC = gcc -pipe
-LINK32 = gcc
+LINK32 = gcc -pipe
 LIB32 = ar
 IMPLIB = dlltool
 
diff --git a/win32/win32.h b/win32/win32.h
index f730dea..0eda0ed 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -164,7 +164,6 @@ extern	char *	getlogin(void);
 
 DllExport void		Perl_win32_init(int *argcp, char ***argvp);
 DllExport void		Perl_init_os_extras(void);
-/*DllExport void		win32_str_os_error(struct sv *s, DWORD err);*/
 DllExport void		win32_str_os_error(void *sv, DWORD err);
 
 #ifndef USE_SOCKETS_AS_HANDLES