summaryrefslogtreecommitdiff
path: root/EXTERN.h
diff options
context:
space:
mode:
authorTim Bunce <Tim.Bunce@ig.co.uk>1997-06-11 12:00:00 +1200
committerTim Bunce <Tim.Bunce@ig.co.uk>1997-06-11 12:00:00 +1200
commit3e3baf6d63945cb64e829d6e5c70a7d00f3d3d03 (patch)
tree0143be655536dc428f4fa3cc7d01f6bcffe14c01 /EXTERN.h
parent08aa1457cd52a368c210ab76a3da91cfadabea1a (diff)
parent3458556dd685b1767b760a72bd2e9007b5c4575e (diff)
downloadperl-3e3baf6d63945cb64e829d6e5c70a7d00f3d3d03.tar.gz
[differences between cumulative patch application and perl5.004_01]perl-5.004_01
[editor's note: The changes between this and 5.004 were processed from the m1t2 release, which was a bad idea as it was the _01 release which had the final corrected attributions. The differences between the various m*t* releases do that; I considered it most valuable just to look at the _NN releases. Many patches have been separated out and/or applied from the p5p archives nonetheless.]
Diffstat (limited to 'EXTERN.h')
-rw-r--r--EXTERN.h21
1 files changed, 7 insertions, 14 deletions
diff --git a/EXTERN.h b/EXTERN.h
index ec062ee721..228ed52406 100644
--- a/EXTERN.h
+++ b/EXTERN.h
@@ -23,24 +23,17 @@
# define EXTCONST globalref
# define dEXTCONST globaldef {"$GLOBAL_RO_VARS"} readonly
#else
-# if defined(_MSC_VER) && defined(_WIN32)
+# if (defined(_MSC_VER) && defined(_WIN32)) || (defined(__BORLANDC__) && defined(__WIN32__))
# ifdef PERLDLL
-# define EXT __declspec(dllexport)
+# define EXT extern __declspec(dllexport)
# define dEXT
-# define EXTCONST __declspec(dllexport) const
+# define EXTCONST extern __declspec(dllexport) const
# define dEXTCONST const
# else
-# if defined(__cplusplus)
-# define EXT extern __declspec(dllimport)
-# define dEXT
-# define EXTCONST extern __declspec(dllimport) const
-# define dEXTCONST const
-# else
-# define EXT __declspec(dllimport)
-# define dEXT
-# define EXTCONST __declspec(dllimport) const
-# define dEXTCONST const
-# endif
+# define EXT extern __declspec(dllimport)
+# define dEXT
+# define EXTCONST extern __declspec(dllimport) const
+# define dEXTCONST const
# endif
# else
# define EXT extern