tweaks for win32/borland

p4raw-id: //depot/perl@3668

diff --git a/t/pragma/locale.t b/t/pragma/locale.t
index 9fa565e..f6b0f2d 100755 (executable)
--- a/t/pragma/locale.t
+++ b/t/pragma/locale.t
@@ -452,6 +452,9 @@ foreach $Locale (@Locale) {
     if (@Neoalpha == 0) {
        # If we have no Neoalphas the remaining tests are no-ops.
        debug "# no Neoalpha, skipping tests 99..102 for locale '$Locale'\n";
+       foreach (99..102) {
+           push @{$Okay{$_}}, $Locale;
+       }
     } else {
 
        # Test \w.

diff --git a/win32/makedef.pl b/win32/makedef.pl
index 96b540b..698f008 100644 (file)
--- a/win32/makedef.pl
+++ b/win32/makedef.pl
@@ -333,6 +333,7 @@ sub emit_symbol {
 
 sub output_symbol {
     my $symbol = shift;
+    $symbol = "_$symbol" if $CCTYPE eq 'BORLAND';
     print "\t$symbol\n";
 # XXX: binary compatibility between compilers is an exercise
 # in frustration :-(

diff --git a/win32/makefile.mk b/win32/makefile.mk
index f69f04d..2289b91 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -138,7 +138,7 @@ CCTYPE              *= BORLAND
 # so you may have to set CCHOME explicitly (spaces in the path name should
 # not be quoted)
 #
-CCHOME         *= C:\bc5
+CCHOME         *= d:\bc5
 #CCHOME                *= $(MSVCDIR)
 #CCHOME                *= D:\packages\mingw32
 CCINCDIR       *= $(CCHOME)\include
@@ -264,7 +264,7 @@ OPTIMIZE    = -O2 $(RUNTIME)
 LINK_DBG       = 
 .ENDIF
 
-CFLAGS         = -w -g0 -tWM -tWD $(INCLUDES) $(LOCDEFS) \
+CFLAGS         = -w -g0 -tWM -tWD $(INCLUDES) $(DEFINES) $(LOCDEFS) \
                $(PCHFLAGS) $(OPTIMIZE)
 LINK_FLAGS     = $(LINK_DBG) -L"$(CCLIBDIR)"
 OBJOUT_FLAG    = -o