summaryrefslogtreecommitdiff
path: root/NetWare
diff options
context:
space:
mode:
authorSteve Hay <steve.m.hay@googlemail.com>2011-09-10 17:21:58 +0100
committerSteve Hay <steve.m.hay@googlemail.com>2011-09-10 18:16:59 +0100
commit378eeda70cc27194f0f718b4c65b8ba147259910 (patch)
tree26c3c6b5adb9c5027a78c6143cdced30ce57a9d4 /NetWare
parent528bd3ce854c33aaf668dd3aa007a60a4994edac (diff)
downloadperl-378eeda70cc27194f0f718b4c65b8ba147259910.tar.gz
The Borland Chainsaw Massacre
Remove support for the Borland C++ compiler on Win32, as agreed here: http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2011-09/msg00034.html
Diffstat (limited to 'NetWare')
-rw-r--r--NetWare/Makefile3
-rw-r--r--NetWare/nw5iop.h8
-rw-r--r--NetWare/nw5thread.h2
3 files changed, 2 insertions, 11 deletions
diff --git a/NetWare/Makefile b/NetWare/Makefile
index 90747871ad..2ddc3bc39b 100644
--- a/NetWare/Makefile
+++ b/NetWare/Makefile
@@ -864,8 +864,7 @@ all : .cleanoldfiles .\nwconfig.h $(CONFIGPM) $(NLM_NAME) $(EXTENSION_NLM) $(EXT
$(MINIPERL) -I..\lib config_sh.PL $(NW_CFG_VARS) config.nw5 > ..\config.sh
# this target is for when changes to the main config.sh happen
-# edit config.{b,v,g,w}c and make this target once for each supported
-# compiler (e.g. `dmake CCTYPE=BORLAND regen_config_h`)
+# edit config.wc and make this target
regen_config_h:
perl config_sh.PL $(NW_CFG_VARS) $(NW_CFGSH_TMPL) > ..\config.sh
cd ..
diff --git a/NetWare/nw5iop.h b/NetWare/nw5iop.h
index 391c899da6..0026b32181 100644
--- a/NetWare/nw5iop.h
+++ b/NetWare/nw5iop.h
@@ -191,14 +191,6 @@ END_EXTERN_C
#undef uname
#undef wait
-#ifdef __BORLANDC__
-#undef ungetc
-#undef getc
-#undef putc
-#undef getchar
-#undef putchar
-#undef fileno
-#endif
#define environ (*nw_environ())
diff --git a/NetWare/nw5thread.h b/NetWare/nw5thread.h
index 6bdba245b5..b1a2534b68 100644
--- a/NetWare/nw5thread.h
+++ b/NetWare/nw5thread.h
@@ -154,7 +154,7 @@ typedef unsigned long perl_mutex;
#endif //#if 0
//Following has to be defined CHKSGP
-#if defined(PERLDLL) && defined(USE_DECLSPEC_THREAD) && (!defined(__BORLANDC__) || defined(_DLL))
+#if defined(PERLDLL) && defined(USE_DECLSPEC_THREAD)
extern __declspec(thread) void *PL_current_context;
#define PERL_SET_CONTEXT(t) (PL_current_context = t)
#define PERL_GET_CONTEXT PL_current_context