dike out old macos patch that now fails with the PDL_Anyval code (and…

… is no longer needed) (was a duct tape solution to an early MacOSX bug)
PDLPorters · Sep 28, 2015 · dfa1a29 · dfa1a29
1 parent 7b8cf9a
commit dfa1a29
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/Basic/Core/Makefile.PL b/Basic/Core/Makefile.PL
@@ -10,7 +10,6 @@ my $pthread_include = $Config::Config{usrinc};  # not good for win32
 my $pthread_library = '-lpthread';                                  # not good for MSVC
 my $pthread_define  = ' -DPDL_PTHREAD ';
 
-my $macos_braindamage_define = ($^O eq 'darwin') ? " -DMACOS_MZERO_BRAINDAMAGE " : "";
 my $badval_define = " -DBADVAL=$PDL::Config{WITH_BADVAL} -DBADVAL_USENAN=$PDL::Config{BADVAL_USENAN} -DBADVAL_PER_PDL=$PDL::Config{BADVAL_PER_PDL}";
 
 my $malloclib = $PDL::Config{MALLOCDBG}->{libs};
@@ -239,7 +238,7 @@ WriteMakefile(
 		},
  'PL_FILES'     => {map {($_ => nopl $_)} grep {!/^Makefile.PL$/} <*.PL>},
  'OBJECT'       => 'Core$(OBJ_EXT) ' . $cobj,
- 'DEFINE' 	=> $pthread_define.$macos_braindamage_define.$badval_define,
+ 'DEFINE' 	=> $pthread_define.$badval_define,
  'LIBS'         => ["$pthread_library $malloclib"],
  'clean'        => {'FILES'  => $cobj .
                    ' pdlconv.c pdlsections.c pdlcore.c '.

diff --git a/Basic/Core/pdlsections.g b/Basic/Core/pdlsections.g
@@ -230,11 +230,6 @@ PDL_Anyval pdl_at( void* x, int datatype, PDL_Indx* pos, PDL_Indx* dims,
 
    ENDGENERICLOOP
 
-#ifdef MACOS_MZERO_BRAINDAMAGE
-    if(!result)
-        result=0;
-#endif
-
    return result;
 }