Skip to content

Commit

Permalink
Remove all #ifdef MACOS_TRADITIONAL code in core and non-dual-life XS…
Browse files Browse the repository at this point in the history
… code.

(MacOS support was removed from MakeMaker in 6.22, and merged to blead on
15th December 2004 with 5dca256. After this
point MacOS wouldn't even have been able to build the perl binary, because it
would not have been able to build DynaLoader. If anyone wishes to resurrect
MacOS, start by reversing this commit and the relevant part of that commit.)
  • Loading branch information
nwc10 committed Apr 27, 2009
1 parent f210009 commit e37778c
Show file tree
Hide file tree
Showing 14 changed files with 43 additions and 661 deletions.
6 changes: 1 addition & 5 deletions cop.h
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,7 @@ struct cop {
#define CopLINE_set(c,l) (CopLINE(c) = (l))

/* OutCopFILE() is CopFILE for output (caller, die, warn, etc.) */
#ifdef MACOS_TRADITIONAL
# define OutCopFILE(c) MacPerl_MPWFileName(CopFILE(c))
#else
# define OutCopFILE(c) CopFILE(c)
#endif
#define OutCopFILE(c) CopFILE(c)

/* If $[ is non-zero, it's stored in cop_hints under the key "$[", and
HINT_ARYBASE is set to indicate this.
Expand Down
13 changes: 1 addition & 12 deletions doio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1395,7 +1395,7 @@ Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp,
{
dVAR;
PERL_ARGS_ASSERT_DO_AEXEC5;
#if defined(MACOS_TRADITIONAL) || defined(__SYMBIAN32__) || defined(__LIBCATAMOUNT__)
#if defined(__SYMBIAN32__) || defined(__LIBCATAMOUNT__)
Perl_croak(aTHX_ "exec? I'm not *that* kind of operating system");
#else
if (sp > mark) {
Expand Down Expand Up @@ -1943,10 +1943,6 @@ Perl_cando(pTHX_ Mode_t mode, bool effective, register const Stat_t *statbufp)
static bool
S_ingroup(pTHX_ Gid_t testgid, bool effective)
{
#ifdef MACOS_TRADITIONAL
/* This is simply not correct for AppleShare, but fix it yerself. */
return TRUE;
#else
dVAR;
if (testgid == (effective ? PL_egid : PL_gid))
return TRUE;
Expand All @@ -1971,7 +1967,6 @@ S_ingroup(pTHX_ Gid_t testgid, bool effective)
#else
return FALSE;
#endif
#endif
}

#if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
Expand Down Expand Up @@ -2352,11 +2347,6 @@ Perl_vms_start_glob
fp = Perl_vms_start_glob(aTHX_ tmpglob, io);

#else /* !VMS */
#ifdef MACOS_TRADITIONAL
sv_setpv(tmpcmd, "glob ");
sv_catsv(tmpcmd, tmpglob);
sv_catpv(tmpcmd, " |");
#else
#ifdef DOSISH
#ifdef OS2
sv_setpv(tmpcmd, "for a in ");
Expand Down Expand Up @@ -2388,7 +2378,6 @@ Perl_vms_start_glob
#endif
#endif /* !CSH */
#endif /* !DOSISH */
#endif /* MACOS_TRADITIONAL */
(void)do_open(PL_last_in_gv, (char*)SvPVX_const(tmpcmd), SvCUR(tmpcmd),
FALSE, O_RDONLY, 0, NULL);
fp = IoIFP(io);
Expand Down
4 changes: 0 additions & 4 deletions doop.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,6 @@ S_do_trans_complex(pTHX_ SV * const sv)
if (complement && !del)
rlen = tbl[0x100];

#ifdef MACOS_TRADITIONAL
#define comp CoMP /* "comp" is a keyword in some compilers ... */
#endif

if (PL_op->op_private & OPpTRANS_SQUASH) {
UV pch = 0xfeedface;
while (s < send) {
Expand Down
Loading

0 comments on commit e37778c

Please sign in to comment.